From 1ea54e3924870b960430593903478eb9e3e0d4dd Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 10 Aug 2022 16:42:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95-=E6=94=B6?=
 =?UTF-8?q?=E5=88=B0=E8=AE=BE=E8=AE=A1=E7=AC=A6=E5=90=88=E6=80=A7,Pre-Homo?=
 =?UTF-8?q?,=E9=AA=8C=E8=AF=81=E7=AC=A6=E5=90=88=E6=80=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1-=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectLawsInventoryEOServiceImpl.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 91fbcc37e..023bd336c 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
@@ -1350,7 +1350,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 					//消息内容
 					String msgContentEN = currentUser.getUsername() + " initiated the regulation list confirmation for "
 							+ projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
-							+ ". The due date is：" +inventoryAffirmDueDate+ " .Please check and address it in a timely manner.";
+							+ ". The due date is " + inventoryAffirmDueDate+ ". Please check and address it in a timely manner.";
 					String msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 							+ ": You have a regulation list confirmation task to complete";
 
@@ -2117,11 +2117,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		String taskType = "";
 		String initiator = "";
 		String initiatorLark = "";
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
 		if (StringUtils.equals(msgType, MsgTypeEnum.TASK_AFFIRM_START_MSG.getValue())) {
 			userIdList.add(engineeringInterfacePerson);
 			msgContentEN = sysUser.getUsername() + " initiated the regulation task confirmation of " + projectNameInfoEO.getProjectName()
-					+ ".The due date is：" +taskAffirmDueDate+ " Please check and address it in a timely manner.";
+					+ ". The due date is " + taskAffirmDueDate + ". Please check and address it in a timely manner.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a regulation task confirmation to complete";
 
@@ -2136,7 +2137,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			String dreUserId = jsonObject.getString("dreUserId"); //dre用户id
 			userIdList.add(dreUserId);
 			msgContentEN = sysUser.getUsername() + " has assigned the regulation task confirmation of " + serialNumber + " in "+ projectNameInfoEO.getProjectName()
-					+ ".to you. the due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
+					+ " to you. The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a regulation task confirmation to complete";
 
@@ -2150,7 +2151,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		} 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()
-					+ ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
+					+ ". The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a regulation task confirmation to complete";
 
@@ -2164,7 +2165,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		} 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()
-					+ ".The due date is " +taskAffirmDueDate+ " Please check and handle it in time.";
+					+ ". The due date is " +taskAffirmDueDate+ ". Please check and handle it in time.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a regulation task confirmation to complete";
 
@@ -2207,7 +2208,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			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.";
+					+ ". The due date is " + sdf.format(projectLawsInventoryEO.getDesignDueDate()) + ". Please check and address it in a timely manner.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a design compliance task to complete";
 
@@ -2225,7 +2226,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			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.";
+					+ ". The due date is " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate()) + ". Please check and address it in a timely manner.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a Pre-Homo task to complete";
 
@@ -2244,7 +2245,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			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.";
+					+ ". The due date is " + sdf.format(projectLawsInventoryEO.getVerifyDueDate()) + ". Please check and address it in a timely manner.";
 			msgTitle = projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBase.getTargetMarket()
 					+ ": You have a validation compliance task to complete";