From c1f93fda037a0d921b58e3c02820782e63849f34 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 11 Jul 2022 11:23:51 +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=E9=80=9A=E8=BF=87=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=99=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=8F=91=E9=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/project/enums/MsgTypeEnum.java    |  3 ++
 .../ProjectLawsInventoryEOServiceImpl.java    | 36 +++++++++++++++++++
 2 files changed, 39 insertions(+)

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 f84d5bd68..3be535686 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
@@ -27,6 +27,9 @@ public enum MsgTypeEnum {
     DESIGN_CHARGE_PERSON_SUBMIT_MSG("设计符合性责任人提交给发起人发送消息","designChargePersonSubmitMsg"),
     PREHOMO_CHARGE_PERSON_SUBMIT_MSG("prehomo责任人提交给发起人发送消息","prehomoChargePersonSubmitMsg"),
     VERIFY_CHARGE_PERSON_SUBMIT_MSG("验证符合性责任人提交给发起人发送消息","verifyChargePersonSubmitMsg"),
+    DESIGN_INITIATOR_ACCEPTED_MSG("设计符合性发起人通过发送消息","designInitiatorAcceptedMsg"),
+    PREHOMO_INITIATOR_ACCEPTED_MSG("prehomo发起人通过发送消息","prehomoInitiatorAcceptedMsg"),
+    VERIFY_INITIATOR_ACCEPTED_MSG("验证符合性发起人通过发送消息","verifyInitiatorAcceptedMsg"),
     ;
 
     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 bbfe42936..577094efb 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
@@ -2232,6 +2232,42 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 
 			messageTypeEnum = MessageTypeEnum.VALIDATION_TASK;
 			taskType = "Validation Compliance Confirmation";
+		}else if(StringUtils.equals(msgType, MsgTypeEnum.DESIGN_INITIATOR_ACCEPTED_MSG.getValue())){
+			String designDutyId = jsonObject.getString("designDutyId"); //设计符合性责任人id
+			userIdList.add(designDutyId);
+			msgContentEN = "The design compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a design compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.DESIGN_COMPLIANCE_NOTIFICATION;
+			taskType = "Design Compliance Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.PREHOMO_INITIATOR_ACCEPTED_MSG.getValue())){
+			String prehomoDutyId = jsonObject.getString("prehomoDutyId"); //pre-Home责任人id
+			userIdList.add(prehomoDutyId);
+			msgContentEN = "The Pre-Homo confirmation information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ ". you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a Pre-Homo task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.PRE_HOMO_NOTIFICATION;
+			taskType = "Pre-Homo Confirmation";
+		} else if(StringUtils.equals(msgType, MsgTypeEnum.VERIFY_INITIATOR_ACCEPTED_MSG.getValue())){
+			String verifyDutyId = jsonObject.getString("verifyDutyId"); //验证符合性责任人id
+			userIdList.add(verifyDutyId);
+			msgContentEN = "The validation compliance information of " + serialNumber +" in "+ projectNameInfoEO.getProjectName()
+					+ "you sumitted has been approved.";
+			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
+					+ ": You have a validation compliance task to complete";
+
+			feishuMsgVo.setContent("Hello! The compliance information you submitted has been approved.");
+
+			messageTypeEnum = MessageTypeEnum.VALIDATION_COMPLIANCE_NOTIFICATION;
+			taskType = "Validation Compliance Confirmation";
 		}
 
 		if(CollectionUtils.isNotEmpty(userIdList) && StringUtils.isNotEmpty(msgContentEN)){