From 1de3cbb1ffd64ed1dcc0e7fcf60ee046514e73fe Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 7 Mar 2022 11:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93--=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0a=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index b5f5bc9b8..39a839166 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -1011,6 +1011,10 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //1. 处理订阅的发送消息
         //修改的内容
         StringBuilder sb = getUpdateInfo(map, dataList, fieldList, fieldDateList, fieldFileList, fieldPullList, cut);
+        String sbStr = "";
+        if(ObjectUtils.isNotEmpty(sb)){
+            sbStr = sb.substring(0,sb.length()-1);
+        }
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String serialNumber = (String) dataList.get(0).get("serial_number");
         //只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”)
@@ -1026,9 +1030,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameList, ","));
             List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
 
+            String id = (String) map.get("id");
+            String title = (String) map.get("title");
+            String href = "<a href='/docManage/library?id:" + id +
+                    "&title:" + title +
+                    "&serial_number:" + serialNumber + "'"+" target='_blank'>"+serialNumber+"</a>";
 
             String content = sysUser.getRealname()+"对"+serialNumber+"进行了修改请及时查看";
-            String contentInfo = sysUser.getRealname()+"修改标准"+serialNumber+"中"+sb.toString();
+            String contentInfo = sysUser.getRealname()+"修改标准"+href+"中"+sbStr.toString();
             //封装消息的实体类
             SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
@@ -1042,8 +1051,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             //代替标准(根据id查询出来的)
             String replaceStandardTemp = (String) dataList.get(0).get("replace_standard");
 
-            List<String> userNameListTemp = new ArrayList<>();
-            List<String> serialNumberList = new ArrayList<>();
             //(1)此种情况为编辑前代替标准就已经有数据了
             if (StringUtils.isNotBlank(replaceStandardTemp) && !replaceStandard.equals(replaceStandardTemp)) {
                 //需要向被替代标准的法规工程师发送站内通知和飞书信息，提醒内容："新标准编号"已实施，请注意更新“替代标准编号”状态
@@ -1076,14 +1083,27 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         List<Map<String, Object>> mapList = this.listMaps(lambdaQueryWrapperTemp);
         List<String> userNameListTemp = new ArrayList<>();
         List<String> serialNumberList = new ArrayList<>();
+        StringBuilder sb = new StringBuilder();
         for (Map<String, Object> stringObjectMap : mapList) {
+            String id = (String) stringObjectMap.get("id");
+            String serialNumber = (String) stringObjectMap.get("serial_number");
+            String title = (String) stringObjectMap.get("title");
             userNameListTemp.add((String) stringObjectMap.get("create_by"));
-            serialNumberList.add((String) stringObjectMap.get("serial_number"));
+            serialNumberList.add(serialNumber);
+
+            String href = "<a href='/docManage/library?id:" + id +
+                "&title:" + title +
+                "&serial_number:" + serialNumber + "'"+" target='_blank'>"+serialNumber+"</a>,";
+            sb.append(href);
+        }
+        String sbStr = "";
+        if(ObjectUtils.isNotEmpty(sb)){
+            sbStr = sb.substring(0,sb.length()-1);
         }
         List<SysUser> userList = sysUserMapper.getUserListByNames(StringUtils.join(userNameListTemp, ","));
         List<String> userIdList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
         String content = "新标准编号已实施，请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态";
-        String contentInfo = "新标准编号已实施，请注意更新替代标准编号:" + StringUtils.join(serialNumberList, ",") + "的状态," + "链接: http://localhost:3000/docManage/library";
+        String contentInfo = "新标准编号已实施，请注意更新替代标准编号:" + sbStr + "的状态," + "链接: http://localhost:3000/docManage/library";
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);