From 33eaacfecc928b91ab6a87addd2906a5e0289b1f Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 18:41:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080086=20=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E5=90=8E=E7=BB=99=E6=8A=84=E9=80=81=E4=BA=BA=E5=91=98=E5=8F=91?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java  | 43 ++++++++++++++-----
 .../entity/LawsAssessResults.java             |  4 ++
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 59916210..9b40bf99 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -662,6 +662,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         String taskId = processDTO.getTaskId();
         taskService.complete(taskId);
         //同步数据到项目库的评估结果
+        List<String> standardIdList = new ArrayList<>();
+        List<SendMessageDTO> sendMessageDTOList = new ArrayList<>();
         List<LawsAssessResults> lawsAssessResultsList = new ArrayList<>();
         List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
         for (ProcessProjectAssessTerm assessTerm : processProjectAssessTermList) {
@@ -680,6 +682,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             //lawsAssessResults.setTermId(assessTerm.getSplitInfoId());
             lawsAssessResults.setStandardId(assessTerm.getStandardId());
             lawsAssessResults.setTermNumber(assessTerm.getTermNumber());
+            lawsAssessResults.setTermName(assessTerm.getTermName());
             lawsAssessResults.setFileId(assessTerm.getFileId());
             lawsAssessResults.setRiskPoints(assessTerm.getRiskPoints());
             lawsAssessResults.setValidateSolution(assessTerm.getValidateSolution());
@@ -691,6 +694,32 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             lawsAssessResults.setProcessDefinitionId(processDTO.getProcessDefinitionId());
             lawsAssessResults.setProcessInstanceId(processDTO.getProcessInstanceId());
             lawsAssessResultsList.add(lawsAssessResults);
+            String standardId = assessTerm.getStandardId();
+            LawsDomesticStandard domesticStandard = lawsDomesticStandardService.getById(standardId);
+            String standardName;
+            String standardNumber;
+            if (domesticStandard != null){
+                standardName = domesticStandard.getStandardName();
+                standardNumber = domesticStandard.getStandardNumber();
+            }else {
+                LawsOverseasStandard overseasStandard = lawsOverseasStandardService.getById(standardId);
+                standardName = overseasStandard.getStandardName();
+                standardNumber = overseasStandard.getStandardNumber();
+            }
+            if (!standardIdList.contains(standardId)) {
+                standardIdList.add(standardId);
+                //发送消息
+                String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
+                SendMessageDTO sendMessageDTO = new SendMessageDTO();
+                sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
+                sendMessageDTO.setToUserId(carbonCopyPersonnels);
+                Map<String, String> sendMap = new HashMap<>();
+                sendMap.put("standardNumber", standardNumber);
+                sendMap.put("standardName", standardName);
+                sendMap.put("projectName", lawsProjectLibrary.getProjectName());
+                sendMessageDTO.setMap(sendMap);
+                sendMessageDTOList.add(sendMessageDTO);
+            }
         }
 
         lawsAssessResultsService.saveBatch(lawsAssessResultsList);
@@ -766,17 +795,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         }
         lawsEvaluationNotMetService.saveBatch(evaluationNotMetList);
         //发送消息
-        String carbonCopyPersonnels = businessInfoDTO.getCarbonCopyPersonnels();
-        SendMessageDTO sendMessageDTO = new SendMessageDTO();
-        sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.PROJECT_ASSESS_COMPLETE);
-        sendMessageDTO.setToUserId(carbonCopyPersonnels);
-        Map<String, String> sendMap = new HashMap<>();
-        ProcessAll process = processAllService.getByProcessInstanceId(processDTO.getProcessInstanceId());
-        sendMap.put("prcNum", process.getPrcNum());
-        sendMap.put("prcName", process.getPrcName());
-        sendMap.put("projectName", lawsProjectLibrary.getProjectName());
-        sendMessageDTO.setMap(sendMap);
-        sendMessageAPI.sendMessage(sendMessageDTO);
+        for (SendMessageDTO sendMessageDTO : sendMessageDTOList) {
+            sendMessageAPI.sendMessage(sendMessageDTO);
+        }
     }
 
     //各部门主管级领导下发
diff --git a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
index a89bc194..b8753cb7 100644
--- a/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
+++ b/laws-modules/src/main/java/com/jero/modules/projectLibrary/entity/LawsAssessResults.java
@@ -96,6 +96,10 @@ public class LawsAssessResults implements Serializable {
     @ApiModelProperty(value = "条款号")
     private String termNumber;
 
+	/**条款名称*/
+    @ApiModelProperty(value = "条款名称")
+    private String termName;
+
 	/**项目编号*/
     @ApiModelProperty(value = "项目编号")
     private String projectNo;