From cbaca6ef7332686d7e5eb18d0dcb7cb03ad0c186 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 10:52:22 +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=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=8F=90=E4=BA=A4=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=EF=BC=8C=E7=BB=99=E5=8F=91=E8=B5=B7=E4=BA=BA=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=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    | 54 +++++++++++++++----
 3 files changed, 49 insertions(+), 10 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 2be622546..e9fa81854 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 ComplianceTask", "11"), // 验证符合性任务
+    VALIDATION_TASK("Validation Compliance Task", "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 ab51f244e..f84d5bd68 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
@@ -24,6 +24,9 @@ public enum MsgTypeEnum {
     DESIGN_START_MSG("设计符合性发起给责任人发送消息","designStartMsg"),
     PREHOMO_START_MSG("prehomo发起给责任人发送消息","prehomoStartMsg"),
     VERIFY_START_MSG("验证符合性发起给责任人发送消息","verifyStartMsg"),
+    DESIGN_CHARGE_PERSON_SUBMIT_MSG("设计符合性责任人提交给发起人发送消息","designChargePersonSubmitMsg"),
+    PREHOMO_CHARGE_PERSON_SUBMIT_MSG("prehomo责任人提交给发起人发送消息","prehomoChargePersonSubmitMsg"),
+    VERIFY_CHARGE_PERSON_SUBMIT_MSG("验证符合性责任人提交给发起人发送消息","verifyChargePersonSubmitMsg"),
     ;
 
     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 6369b014c..bbfe42936 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
@@ -2103,7 +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();
+			taskType = "Regulation Task Confirmation";
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_ISSUE_DRE_MSG.getValue())) {
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
@@ -2115,7 +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();
+			taskType = "Regulation Task Confirmation";
 		} 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()
@@ -2126,7 +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();
+			taskType = "Regulation Task Confirmation";
 		} 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()
@@ -2137,7 +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();
+			taskType = "Regulation Task Confirmation";
 		} 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()
@@ -2148,7 +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();
+			taskType = "Regulation Task Confirmation";
 		} 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()
@@ -2159,7 +2159,7 @@ 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();
+			taskType = "Regulation Task Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_START_MSG.getValue())){
 			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
 			userIdList.add(designDutyId);
@@ -2171,7 +2171,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
-			taskType = MessageTypeEnum.DESIGN_COMPLIANCE_TASK.getName();
+			taskType = "Design Compliance Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_START_MSG.getValue())){
 			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
 			userIdList.add(prehomoDutyId);
@@ -2183,7 +2183,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
-			taskType = MessageTypeEnum.PRE_HOMO_TASK.getName();
+			taskType = "Pre-Homo Confirmation";
 		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_START_MSG.getValue())){
 			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
 			userIdList.add(verifyDutyId);
@@ -2195,7 +2195,43 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			feishuMsgVo.setContent("Hello! Please address the task in a timely manner.");
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
-			taskType = MessageTypeEnum.VALIDATION_TASK.getName();
+			taskType = "Validation Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String designInitiatorId = jsonObject.getString("designInitiatorId"); //设计符合性发起人id
+			userIdList.add(designInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the design compliance confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_TASK;
+			taskType = "Design Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String prehomoInitiatorId = jsonObject.getString("prehomoInitiatorId"); //pre-Home发起人id
+			userIdList.add(prehomoInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the Pre-Homo confirmation of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_TASK;
+			taskType = "Pre-Homo Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_CHARGE_PERSON_SUBMIT_MSG.getValue())){
+			String verifyInitiatorId = jsonObject.getString("verifyInitiatorId"); //验证符合性发起人id
+			userIdList.add(verifyInitiatorId);
+			msgContentEN = sysUser.getUsername() + " has submitted the validation compliance confirmation " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". Please check and review it in time.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance confirmation has been submitted. Please check and review it in a timely manner.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
+			taskType = "Validation Compliance Confirmation";
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){