From bb72671a479a495c2b12f3b9dae1974723801c86 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 10:26:05 +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=E6=B5=81=E7=A8=8B=E7=BB=99=E8=B4=A3?=
 =?UTF-8?q?=E4=BB=BB=E4=BA=BA=E5=8F=91=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constant/enums/MessageTypeEnum.java       |  2 +-
 .../modules/project/enums/MsgTypeEnum.java    |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 45 ++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
index dd1eb2bc7..2be622546 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/MessageTypeEnum.java
@@ -17,7 +17,7 @@ public enum MessageTypeEnum {
     REGULATION_TASK_CONFIRMATION_NOTIFICATION("Regulation Task Confirmation Notification", "15"), // 任务确认通知
     DESIGN_COMPLIANCE_TASK("Design Compliance Task", "9"), // 设计符合性任务
     PRE_HOMO_TASK("Pre-Homo Task", "10"), // Pre-Homo任务
-    VALIDATION_TASK("Validation Task", "11"), // 验证符合性任务
+    VALIDATION_TASK("Validation ComplianceTask", "11"), // 验证符合性任务
     DESIGN_COMPLIANCE_NOTIFICATION("Design Compliance Notification", "12"), // 设计符合性通知
     PRE_HOMO_NOTIFICATION("Pre-Homo Notification", "13"), // Pre-Homo通知
     VALIDATION_COMPLIANCE_NOTIFICATION("Validation Compliance Notification", "14"), // 验证符合性通知
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 8131fde64..ab51f244e 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
@@ -21,6 +21,9 @@ public enum MsgTypeEnum {
     DESIGN_RETURN_MSG("设计符合性发起人退回","designReturnMsg"),
     PREHOMO_RETURN_MSG("prehomo发起人退回","prehomoReturnMsg"),
     VERIFY_RETURN_MSG("验证符合性发起人退回","verifyReturnMsg"),
+    DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
+    PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
+    VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
     ;
 
     String name;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index c1f516533..6369b014c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -2091,6 +2091,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 
 		MessageTypeEnum messageTypeEnum = null;
+		String taskType = "";
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
@@ -2102,6 +2103,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please check and address this task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2113,6 +2115,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has assigned the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_REJECTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2123,6 +2126,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_DRE_ACCEPTED.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " has submitted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2133,6 +2137,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has submitted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_REJECTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has rejected the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2143,6 +2148,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has rejected the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_TASK.getName();
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ACCEPTED_MSG.getValue())){
 			userIdList.add(projectLibraryBase.getStudioEngineer());
 			msgContentEN = sysUser.getUsername() + " has accepted the regulation task confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
@@ -2153,11 +2159,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! " + sysUser.getUsername() + " has accepted the task. Please check and and handle it in time.");
 
 			messageTypeEnum = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION;
+			taskType = MessageTypeEnum.REGULATION_TASK_CONFIRMATION_NOTIFICATION.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "You recieved the design compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = MessageTypeEnum.DESIGN_COMPLIANCE_TASK.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "You recieved the Pre-Homo task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = MessageTypeEnum.PRE_HOMO_TASK.getName();
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "You recieved the validation compliance task of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". The due date is XXXX. Please check and address it in a timely manner.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = MessageTypeEnum.VALIDATION_TASK.getName();
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){
 
-			feishuMsgVo.setTaskType("Regulation Task Confirmation");
+			feishuMsgVo.setTaskType(taskType);
 			feishuMsgVo.setRegulationNo(serialNumber);
 			feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());
 			feishuMsgVo.setInitiator(sysUser.getUsername());