From 4f37f526a4660b515cb6128e41b09f529a804b64 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 19 Feb 2024 09:59:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081148=20=E4=BC=81=E6=A0=87=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=E5=8A=9E=E7=90=86=E6=9C=AA?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java   | 37 ++++++++++++-------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index c1ca2f6e..f43fcdee 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -823,26 +823,35 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     private void sendMessageToAdviceUser(ProcessEsRevision revision, String processInstanceId) {
         ProcessAll processAll = processAllService.getByProcessInstanceId(processInstanceId);
         List<EsRevisionAdvice> advices = revision.getAdvices();
-        // 发送消息
-        for (EsRevisionAdvice advice : advices) {
-            // 采纳的不发消息
-            if (HandleAdviceEnum.AGREE.getValue().equals(advice.getHandleAdvice())) {
-                continue;
-            }
+        Map<String, List<EsRevisionAdvice>> adviceMap = advices.stream()
+                .collect(Collectors.groupingBy(EsRevisionAdvice::getCreateUserId));
+        // 按照Map的Key遍历
+        for (String userId : adviceMap.keySet()) {
+            List<EsRevisionAdvice> adviceList = adviceMap.get(userId);
             SendMessageDTO sendMessageDTO = new SendMessageDTO();
             sendMessageDTO.setTemplateCode(MessageTemplateCodeCommon.ES_REVISION_ADVICE);
-            sendMessageDTO.setToUserId(advice.getCreateUserId());
+            sendMessageDTO.setToUserId(userId);
             Map<String, String> sendMap = new HashMap<>();
             sendMap.put("prcNum", processAll.getPrcNum());
             sendMap.put("prcName", processAll.getPrcName());
-            sendMap.put("clauseNum", advice.getClauseNum());
-            sendMap.put("clauseName", advice.getClauseName());
-            if (HandleAdviceEnum.DISAGREE.getValue().equals(advice.getHandleAdvice())) {
-                sendMap.put("result", "未被采纳");
-            } else {
-                sendMap.put("result", "被部分采纳");
+            StringBuilder msg = new StringBuilder();
+            for (EsRevisionAdvice advice : adviceList) {
+                msg.append(advice.getClauseNum()).append(" ").append(advice.getClauseName());
+                // 采纳的不发消息
+                if (HandleAdviceEnum.AGREE.getValue().equals(advice.getHandleAdvice())) {
+                    continue;
+                }
+                msg.append(advice.getClauseNum()).append(" ").append(advice.getClauseName());
+                if (HandleAdviceEnum.DISAGREE.getValue().equals(advice.getHandleAdvice())) {
+                    msg.append(" 未被采纳，");
+                } else {
+                    msg.append(" 被部分采纳，");
+                }
+                msg.append("理由为：").append(advice.getReason()).append("；");
             }
-            sendMap.put("reason", advice.getReason());
+            // 去除最后一个分号
+            msg.deleteCharAt(msg.length() - 1);
+            sendMap.put("msg", msg.toString());
             sendMessageDTO.setMap(sendMap);
             sendMessageAPI.sendMessage(sendMessageDTO);
         }