黑名单添加消息回调通知
This commit is contained in:
@ -6,6 +6,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoDateUtils;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoIdUtil;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.common.CoscoType;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.common.MessageType;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.ApproveVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoEvaluate.vo.NoTaskVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoAccessCategory;
|
||||
@ -71,6 +72,11 @@ public class MessageLogAspect {
|
||||
//供应商评价处理完成
|
||||
pustMessageEvaluateEnd(result, messageType);
|
||||
}
|
||||
if (MessageType.MESSAGETYPE_HBLXSH.equals(messageType)) {
|
||||
//黑白名单
|
||||
pustMessageBlackEnd(result, messageType);
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
@ -78,11 +84,36 @@ public class MessageLogAspect {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 黑名单处理完成
|
||||
* @param result
|
||||
* @param messageType
|
||||
*/
|
||||
private void pustMessageBlackEnd(Object result, String messageType) {
|
||||
if (result instanceof BlackApproveVo) {
|
||||
BlackApproveVo vo = (BlackApproveVo) result;
|
||||
String resultast ;
|
||||
List<CoscoMessage> coscoMessageList = new ArrayList<>();
|
||||
if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(vo.getApproveStatus())) {
|
||||
resultast = "已通过";
|
||||
for (String supplierId : vo.getSupperierIds()) {
|
||||
CoscoMessage coscoMessage = coscoMessageData(supplierId, "供应商在" + vo.getDeptName() + "部门,添加黑名单" + resultast, messageType);
|
||||
coscoMessageList.add(coscoMessage);
|
||||
}
|
||||
} else {
|
||||
resultast = "已驳回";
|
||||
}
|
||||
CoscoMessage coscoMessage = coscoMessageData(vo.getDeptId(), "供应商在" + vo.getDeptName() + "部门,添加黑名单" + resultast, messageType);
|
||||
coscoMessageList.add(coscoMessage);
|
||||
pustMessage(coscoMessageList);
|
||||
}
|
||||
}
|
||||
|
||||
private void pustMessageEvaluateEnd(Object result, String messageType) {
|
||||
if (result instanceof ApproveVo) {
|
||||
ApproveVo vo = (ApproveVo) result;
|
||||
String resultast = vo.getResult().toString();
|
||||
if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(resultast)) {
|
||||
String resultast;
|
||||
if (CoscoCategoryConstant.APPROVE_STATUS_PASS.equals(vo.getResult())) {
|
||||
resultast = "已通过";
|
||||
} else {
|
||||
resultast = "已驳回";
|
||||
|
@ -8,6 +8,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
|
||||
|
||||
/**
|
||||
* 供应商黑名单_供应商加入黑灰名单申请Service接口
|
||||
@ -81,7 +82,7 @@ public interface ICoscoBlacklistService {
|
||||
* @param list
|
||||
* @return
|
||||
*/
|
||||
int receiveApprove(CoscoBlacklist list);
|
||||
BlackApproveVo receiveApprove(CoscoBlacklist list);
|
||||
|
||||
/**
|
||||
* 黑白名单恢复审批回调
|
||||
|
@ -16,6 +16,7 @@ import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.AddBlackListVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BecomeDueVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListInfoVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoBlack.vo.BlackListVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo.BlackApproveVo;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.dao.mapper.CoscoSupplierBaseMapper;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.coscosupplier.entity.CoscoSupplierBase;
|
||||
import com.chinaunicom.zyhy.ebtp.supplier.dict.entity.DictProject;
|
||||
@ -179,8 +180,10 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@MessageLog(messageType = MessageType.MESSAGETYPE_HBLXSH)
|
||||
public int receiveApprove(CoscoBlacklist list) {
|
||||
public BlackApproveVo receiveApprove(CoscoBlacklist list) {
|
||||
CoscoBlacklist coscoBlacklist = coscoBlacklistMapper.selectByWorkFlowId(list.getWorkFlowId());
|
||||
List<String> supplierList = new ArrayList<>();
|
||||
|
||||
if (CoscoCategoryConstant.APPROVE_STATUS_WAIT.equals(coscoBlacklist.getApproveStatus())) {
|
||||
coscoBlacklist.setApproveStatus(list.getApproveStatus());
|
||||
coscoBlacklist.setStartTime(new Date());
|
||||
@ -192,6 +195,7 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
||||
coscoBlacklistSupplier.setBlacklistId(coscoBlacklist.getId());
|
||||
List<CoscoBlacklistSupplier> coscoBlacklistSuppliers = coscoBlacklistSupplierService.selectCoscoBlacklistSupplierList(coscoBlacklistSupplier);
|
||||
coscoBlacklistSuppliers.forEach(cosupplier -> {
|
||||
supplierList.add(cosupplier.getSupplierId());
|
||||
//判断黑名单
|
||||
if (coscoBlacklist.getBacklistType().equals(CoscoCategoryConstant.BLACKLIST_TYPE_BLACK)) {
|
||||
CoscoSupplierBase coscoSupplierBase = new CoscoSupplierBase();
|
||||
@ -209,7 +213,12 @@ public class CoscoBlacklistServiceImpl implements ICoscoBlacklistService {
|
||||
});
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
BlackApproveVo vo=new BlackApproveVo();
|
||||
vo.setDeptId(coscoBlacklist.getDeptId());
|
||||
vo.setDeptName("部门");
|
||||
vo.setApproveStatus(coscoBlacklist.getApproveStatus());
|
||||
vo.setSupperierIds(supplierList);
|
||||
return vo;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -0,0 +1,28 @@
|
||||
package com.chinaunicom.zyhy.ebtp.supplier.coscoCategory.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class BlackApproveVo {
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
private String deptId;
|
||||
/**
|
||||
* 部门名称
|
||||
*/
|
||||
private String deptName;
|
||||
/**
|
||||
* 状态
|
||||
*/
|
||||
private Long approveStatus;
|
||||
/**
|
||||
* 供应商id
|
||||
*/
|
||||
private List<String> supperierIds;
|
||||
|
||||
|
||||
}
|
Reference in New Issue
Block a user