From 2a4f848d7e95b811696372ed8d10076f54f12c6f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 4 Jul 2022 15:06:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81prehomo=E3=80=81?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=AE=A1=E6=A0=B8=E9=80=80?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E7=BB=99=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=88=E6=A8=A1=E6=9D=BF=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/project/enums/MsgTypeEnum.java | 4 ++ .../ProjectTaskInventoryEOServiceImpl.java | 44 ++++++++++++++++--- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java index d602fd513..7adee9350 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/MsgTypeEnum.java @@ -15,6 +15,10 @@ public enum MsgTypeEnum { PREHOMO_REMIND_MSG("prehomo提醒办理","prehomoRemindMsg"), VERIFY_ISSUE_DRE_MSG("验证符合性确认分配dre消息","verifyIssueDreMsg"), VERIFY_REMIND_MSG("验证符合性确认提醒办理","verifyRemindMsg"), + + DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"), + PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"), + VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 54a89a29c..8165dbfad 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -278,6 +278,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl().success("调用成功！"); @@ -644,17 +646,49 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id - userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + if(StringUtils.isNotEmpty(dreUserIds)){ + userIdList.addAll(Arrays.asList(dreUserIds.split(","))); + } + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) { msgContentEN = sysUser.getUsername() + "has assigned the design compliance confirmation process of " + serialNumber + " in " + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + " to you. Please check and handle it in time."; - } - FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); - feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); - feishuMsgVo.setTaskType("Design Compliance Confirmation"); + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("Design Compliance Confirmation"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_RETURN_MSG.getValue())){ + String designDutyId = jsonObject.getString("designDutyId");//设计符合性流程责任人id + userIdList.add(designDutyId); + + msgContentEN = sysUser.getUsername() + " 将设计符合性流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_RETURN_MSG.getValue())){ + String prehomoDutyId = jsonObject.getString("prehomoDutyId");//prehomo流程责任人id + userIdList.add(prehomoDutyId); + + msgContentEN = sysUser.getUsername() + " 将prehomo流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + }else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_RETURN_MSG.getValue())){ + String verifyDutyId = jsonObject.getString("verifyDutyId");//验证符合性流程责任人id + userIdList.add(verifyDutyId); + + msgContentEN = sysUser.getUsername() + " 将验证符合性流程退回，编号： " + serialNumber + " in " + + projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket() + + " to you. Please check and handle it in time."; + + feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task to you. Please check and handle it in time."); + feishuMsgVo.setTaskType("XXX"); + } feishuMsgVo.setRegulationNo(serialNumber); feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());