From 0a84706ece8c11c18614c553e5f8096ca3ca72ea Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 26 Oct 2022 19:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=A0=87=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...echnologyEvaluationFlowDetailEOMapper.java |  2 +
 ...TechnologyEvaluationFlowDetailEOMapper.xml |  9 +++-
 ...LawsTechnologyEvaluationEOServiceImpl.java | 47 +++++++++++--------
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
index da6be153c..f2c103e1f 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/LawsTechnologyEvaluationFlowDetailEOMapper.java
@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LawsTechnologyEvaluationFlowDetailEOMapper extends BaseMapper<LawsTechnologyEvaluationFlowDetailEO> {
 
+    LawsTechnologyEvaluationFlowDetailEO queryByEvaluationId(@Param("lawsTechnologyEvaluationId") String lawsTechnologyEvaluationId);
+
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
index 72cc2a9f6..c1fdf969b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/mapper/xml/LawsTechnologyEvaluationFlowDetailEOMapper.xml
@@ -14,4 +14,11 @@
         <result column="prc_name" property="prcName" />
         <result column="evaluator_id" property="evaluatorId" />
     </resultMap>
-</mapper>
\ No newline at end of file
+
+    <select id="queryByEvaluationId" resultMap="LawsTechnologyEvaluationFlowDetailEOResultMap">
+
+        select * from laws_technology_evaluation_flow_detail where laws_technology_evaluation_id = #{lawsTechnologyEvaluationId}
+
+    </select>
+
+</mapper>
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
index df2810139..145ff7e00 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java
@@ -20,6 +20,7 @@ import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO;
 import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO;
 import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper;
+import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationFlowDetailEOMapper;
 import com.jero.modules.lawsTechnologyEvaluation.service.*;
 import com.jero.modules.project.enums.JumpLinkEnum;
 import com.jero.modules.project.enums.MsgTypeEnum;
@@ -55,6 +56,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -109,6 +111,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 	@Autowired
 	private IFeishuService feishuService;
+	@Autowired
+	private LawsTechnologyEvaluationFlowDetailEOMapper flowDetailEOMapper;
 
 	/**
 	 * 保存
@@ -615,15 +619,20 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 		}
 
 		//String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId");
-		String serialNumber = jsonObject.getString("serialNumber"); //文档库编号
+		//String serialNumber = jsonObject.getString("serialNumber"); //文档库编号
 
 		List<String> userIdList = new ArrayList<>();
 
 		//String msgContentEN  = "";
 		//String msgTitle = "";
 		String initiator = "";
-		String evaluationTitle= jsonObject.getString("title");
-		String endTime = jsonObject.getString("endTime"); //截止日期
+		String lawsTechnologyEvaluationId = jsonObject.getString("lawsTechnologyEvaluationId");
+		LawsTechnologyEvaluationEO lawsTechnologyEvaluationEO = queryById(lawsTechnologyEvaluationId);
+		LawsTechnologyEvaluationFlowDetailEO flowDetailEO = flowDetailEOMapper.queryByEvaluationId(lawsTechnologyEvaluationId);
+		String number = flowDetailEO.getPrcNum();
+		String name = flowDetailEO.getPrcName();
+		String endTime = new SimpleDateFormat("yyyy-MM-dd").format(lawsTechnologyEvaluationEO.getEndTime());
+
 		String title = MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getCn() + "/" + MessageType2Enum.REGULATION_TECHNICAL_ASSESSMENT.getEn();
 		String cnContentUpper = "";
 		String cnContentLower = "";
@@ -641,13 +650,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = currentUser.getUsername();
 			cnContentUpper = "您好，请及时查看处理此项任务，谢谢！";
-			cnContentLower = "编号：" + serialNumber +
-					"\n标题: " + evaluationTitle +
+			cnContentLower = "编号：" + number +
+					"\n标题: " + name +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! Please check and address the task in a timely manner. Thank you!";
-			enContentLower = "Regulation No :" + serialNumber +
-					"\nTitle: " + evaluationTitle +
+			enContentLower = "Regulation No :" + number +
+					"\nTitle: " + name +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType,MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_ENALUATOR_SUBMIT_MSG.getValue())){
@@ -661,13 +670,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			cnContentUpper = "您好，"+ currentUser.getUsername() +"已提交评估结果，请审核";
-			cnContentLower = "编号：" + serialNumber +
-					"\n标题: " + evaluationTitle +
+			cnContentLower = "编号：" + number +
+					"\n标题: " + name +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the assessment result. Please review it";
-			enContentLower = "Regulation No :" + serialNumber +
-					"\nTitle: " + evaluationTitle +
+			enContentLower = "Regulation No :" + number +
+					"\nTitle: " + name +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_ACCEPTED_MSG.getValue())){
@@ -678,13 +687,13 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			cnContentUpper = "您好，您提交的评估结果已通过";
-			cnContentLower = "编号：" + serialNumber +
-					"\n标题: " + evaluationTitle +
+			cnContentLower = "编号：" + number +
+					"\n标题: " + name +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "Hello! The assessment result you submitted has passed";
-			enContentLower = "Regulation No :" + serialNumber +
-					"\nTitle: " + evaluationTitle +
+			enContentLower = "Regulation No :" + number +
+					"\nTitle: " + name +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_AUDIT_REJECTED_MSG.getValue())){
@@ -695,14 +704,14 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl<LawsTechn
 
 			initiator = MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 			cnContentUpper = "您好，您提交的评估结果被退回，请及时查看处理";
-			cnContentLower = "编号：" + serialNumber +
-					"\n标题: " + evaluationTitle +
+			cnContentLower = "编号：" + number +
+					"\n标题: " + name +
 					"\n发起人: " + initiator +
 					"\n截止时间: " + endTime;
 			enContentUpper = "\n" +
 					"Hello! The assessment result you submitted has been rejected. Please check and address it in a timely manner";
-			enContentLower = "Regulation No :" + serialNumber +
-					"\nTitle: " + evaluationTitle +
+			enContentLower = "Regulation No :" + number +
+					"\nTitle: " + name +
 					"\nInitiator: " + initiator +
 					"\nDue Date: " + endTime;
 		}/*else if(StringUtils.equals(msgType, MsgTypeEnum.LAWS_TECHNOLOGY_EVALUATION_EXPIRE_REMIND_MSG.getValue())){