From 448e29a5db3a672d50606ea2f852de5948aceb68 Mon Sep 17 00:00:00 2001 From: YY <1272464982@qq.com> Date: Tue, 24 Jun 2025 19:58:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=9B=9E=E8=B0=83=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplier/common/aop/MessageLogAspect.java | 35 +++++++++++++++++-- .../service/ICoscoBlacklistService.java | 3 +- .../impl/CoscoBlacklistServiceImpl.java | 13 +++++-- .../coscoCategory/vo/BlackApproveVo.java | 28 +++++++++++++++ 4 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java index c423190..d9e83fb 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/common/aop/MessageLogAspect.java @@ -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 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 = "已驳回"; diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java index 1a12e6c..3be332a 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/ICoscoBlacklistService.java @@ -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); /** * 黑白名单恢复审批回调 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java index 6fb9ee0..90829b0 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoBlack/service/impl/CoscoBlacklistServiceImpl.java @@ -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 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 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 diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java new file mode 100644 index 0000000..f8aeded --- /dev/null +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscoCategory/vo/BlackApproveVo.java @@ -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 supperierIds; + + +}