From eb6ab020048ef51298ee19930257b25d73c5a480 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Tue, 5 Jul 2022 18:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E3=80=81=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E3=80=81prehomo=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E4=BA=BA?=
 =?UTF-8?q?=E9=80=80=E5=9B=9E=EF=BC=8C=E5=8F=91=E6=B6=88=E6=81=AF=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=AE=8C=E5=96=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectTaskInventoryEOServiceImpl.java    | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

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 5322c1377..ac0ea57c2 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
@@ -662,6 +662,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 		SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, currentUserId));
 
+		ProjectLawsInventoryEO projectLawsInventoryEO = this.projectLawsInventoryEOService.getOne(
+				new QueryWrapper<ProjectLawsInventoryEO>().lambda().eq(ProjectLawsInventoryEO::getId, id)
+		);
+
 		String msgContentEN = "";
 		List<String> userIdList = new ArrayList<>();
 		String dreUserIds = jsonObject.getString("dreUserIds"); //dre用户id
@@ -695,9 +699,16 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 
 		FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+		String dutDateStr = "";
+
 		if (StringUtils.equals(msgType, MsgTypeEnum.DESIGN_ISSUE_DRE_MSG.getValue())) {
 			taskKey = DesignComplianceNodeEnum.DRE_DISPOSE.getKey();
 
+			if(projectLawsInventoryEO.getDesignDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			}
+
 			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.";
@@ -710,6 +721,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getDesignDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getDesignDueDate());
+			}
+
 			msgContentEN = "The design compliance information of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review.  Please check and address it in time.";
@@ -722,6 +737,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getPrehomoDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
+			}
+
 			msgContentEN = "The Pre-Homo confirmation of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review. Please check and address it in time.";
@@ -734,6 +753,10 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 
 			taskKey = DesignComplianceNodeEnum.THE_RESPONSIBLE_PERSON_HANDLES_THE_TASK.getKey();
 
+			if(projectLawsInventoryEO.getVerifyDueDate() != null){
+				dutDateStr = sdf.format(projectLawsInventoryEO.getVerifyDueDate());
+			}
+
 			msgContentEN = "The validation compliance information of " + serialNumber + " in "
 					+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ " you sumitted has been rejected after review. Please check and address it in time.";
@@ -741,6 +764,8 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl<ProjectTaskIn
 			feishuMsgVo.setContent("Hello! The compliance information you submitted has been rejected after review. Please check and address it in a timely manner.");
 			feishuMsgVo.setTaskType("Validation Compliance Confirmation");
 		}
+		feishuMsgVo.setDueDate(dutDateStr);
+		feishuMsgVo.setInitiator(sysUser.getUsername());
 		feishuMsgVo.setRegulationNo(serialNumber);
 		feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket());