From 5fe4dfd02e3d32ef277fec594d22cee7f83b3cd9 Mon Sep 17 00:00:00 2001 From: TL <2445390702@qq.com> Date: Tue, 22 Jul 2025 13:19:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zyhy/ebtp/supplier/common/aop/MessageLogAspect.java | 8 ++++---- .../coscosupplier/controller/CoscoMessageController.java | 8 +++++--- .../service/impl/CoscoAccessWorkCategoryServiceImpl.java | 2 +- .../service/impl/CoscoAccessWorkServiceImpl.java | 2 +- .../service/impl/CoscoSupplierexitServiceImpl.java | 3 +++ .../coscosupplier/vo/CoscoSupplierAccessWorkVo.java | 5 +++++ .../vo/CoscoSupplierExitSupplierCategoryVo.java | 1 + 7 files changed, 20 insertions(+), 9 deletions(-) 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 f871af5..6b25317 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 @@ -86,7 +86,7 @@ public class MessageLogAspect { if(MessageType.MESSAGETYPE_GYSZZXX.equals(messageType)){//供应商资质信息处理 pustMessageSupplierCategoryZzxx(result,messageType); } - if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商资质信息处理 + if(MessageType.MESSAGETYPE_PSRY.equals(messageType)){//供应商评审消息处理 pustMessageSupplierCategoryPsry(result,messageType); } } catch (Exception e) { @@ -207,7 +207,7 @@ public class MessageLogAspect { } else { approveStr = "已驳回"; } - String cont = coscoAccessSupplier.getSupplierName() + "，准入" + vo.getDeptId() + "部门，" + approveStr; + String cont = coscoAccessSupplier.getSupplierName() + "，准入" + vo.getOrgName() + "单位，" + approveStr; coscoMessageList.add(coscoMessageData(coscoAccessSupplier.getSupplierId(), cont, messageType)); } pustMessage(coscoMessageList); @@ -232,7 +232,7 @@ public class MessageLogAspect { approveStr = "已驳回"; } String cont = coscoAccessCategory.getSupplierName() + "，准入" + - vo.getDeptId() + "部门的" + + vo.getOrgName() + "单位的" + coscoAccessCategory.getCategoryName() + "品类，" + approveStr; coscoMessageList.add(coscoMessageData(coscoAccessCategory.getSupplierId(), cont, messageType)); } @@ -258,7 +258,7 @@ public class MessageLogAspect { approveStr = "已驳回"; } String cont = coscoSupplierexitSupplierCategory.getSupplierName()+"，"+ - coscoSupplierexitSupplierCategory.getDeptId()+"部门的"+ + vo.getOrgName()+"单位的"+ coscoSupplierexitSupplierCategory.getCategoryName()+"品类退出，"+approveStr; coscoMessageList.add(coscoMessageData(coscoSupplierexitSupplierCategory.getSupplierId(),cont,messageType)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java index c1f2fb4..cf9c3a2 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/controller/CoscoMessageController.java @@ -68,10 +68,12 @@ public class CoscoMessageController extends BaseController { CoscoMessage coscoMessage = new CoscoMessage(); coscoMessage.setRead(0l);//未读 coscoMessage.setType(MessageType.MESSAGETYPE_GYSPLTC); - //获取登录人供应商id BaseCacheUser currentUser = TokenUtil.getCurrentUser(); - String userId = currentUser.getUserId();//登录人id - coscoMessage.setReceiverId(userId); + //如果是供应商登录需要，通过登录人id查询联系人表，获取供应商id，查询供应商详情 + if(CoscoType.USERTYPE_GYS.equals(currentUser.getUserType())){ + CoscoSupplierUser coscoSupplierUser = coscoSupplierUserService.selectCoscoSupplierUserByUserId(currentUser.getUserId()); + coscoMessage.setReceiverId(coscoSupplierUser.getSupplierId()); + } return BaseResponse.success(coscoMessageService.getExitMge(coscoMessage)); } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java index 3c15c72..db88c3b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkCategoryServiceImpl.java @@ -207,7 +207,7 @@ public class CoscoAccessWorkCategoryServiceImpl implements ICoscoAccessWorkCateg //封装消息内容实体 coscoSupplierAccessWorkVo.setSupplierAndCategoryList(supplierAndCateGoryList); coscoSupplierAccessWorkVo.setApproveStatus(coscoAccessWorkData.getApproveStatus()); - coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId()); + coscoSupplierAccessWorkVo.setOrgName(orgService.getOrgInfo(coscoAccessWorkData.getOrgId()).getOrgName()); return coscoSupplierAccessWorkVo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java index 16dd9be..471e55b 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoAccessWorkServiceImpl.java @@ -753,7 +753,7 @@ public class CoscoAccessWorkServiceImpl implements ICoscoAccessWorkService { //封装消息内容实体 coscoSupplierAccessWorkVo.setSupplierList(supplierMessageList); coscoSupplierAccessWorkVo.setApproveStatus(coscoAccessWorkData.getApproveStatus()); - coscoSupplierAccessWorkVo.setDeptId(coscoAccessWorkData.getDeptId()); + coscoSupplierAccessWorkVo.setOrgName(orgService.getOrgInfo(coscoAccessWorkData.getOrgId()).getOrgName()); return coscoSupplierAccessWorkVo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java index 02de7af..255f143 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/service/impl/CoscoSupplierexitServiceImpl.java @@ -257,6 +257,9 @@ public class CoscoSupplierexitServiceImpl implements ICoscoSupplierexitService { coscoSupplierExitSupplierCategoryVo.setCoscoSupplierexitSupplierCategoryList(categoryList); //审批状态 coscoSupplierExitSupplierCategoryVo.setApproveStatus(coscoSupplierexit.getApproveStatus()); + + //查询单位名称，推送消息给该单位 + coscoSupplierExitSupplierCategoryVo.setOrgName(orgService.getOrgInfo(coscoSupplierexit.getOrgId()).getOrgName()); return coscoSupplierExitSupplierCategoryVo; } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java index d925a82..6f8d668 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierAccessWorkVo.java @@ -31,6 +31,11 @@ public class CoscoSupplierAccessWorkVo { * 准入部门 */ String deptId; + /** + * 准入单位 + */ + String orgName; + } diff --git a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java index 3b2d846..228b810 100644 --- a/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java +++ b/src/main/java/com/chinaunicom/zyhy/ebtp/supplier/coscosupplier/vo/CoscoSupplierExitSupplierCategoryVo.java @@ -18,4 +18,5 @@ public class CoscoSupplierExitSupplierCategoryVo { */ Long approveStatus; + String orgName; }