From a7071a238869a3e78c9c55f21e6151a54bf13759 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 2 Jun 2022 11:11:17 +0800
Subject: [PATCH] =?UTF-8?q?bug53454=E8=99=9A=E6=8B=9F=E6=B8=85=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index 00fc4ec0d..054e77c29 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -264,7 +264,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     list.add(dummyContentChangeEOBase);
                 }
                 if(dummyInventoryInfoEOList.size() != 0){
-                    disposeData(dummyInventoryInfoEOList);
+                    disposeDataToEn(dummyInventoryInfoEOList);
                     String info = JSONArray.toJSONString(dummyInventoryInfoEOList);
                     DummyContentChangeEO dummyContentChangeEOInfo = new DummyContentChangeEO();
                     dummyContentChangeEOInfo.setParentId(dummyInventoryBaseEO.getId());
@@ -274,11 +274,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 if(list.size() != 0){
                     iDummyContentChangeEOService.saveBatch(list);
                 }
-//                if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-//                    throw new JeroBootException("维护清单为空,发布失败");
-//                }else{
-//                    throw new JeroBootException("The maintenance list is empty, and publishing failed.");
-//                }
             }else{
                 //1.查询之前保存过的基础数据
                 LambdaQueryWrapper<DummyContentChangeEO> wrapperBase =new LambdaQueryWrapper<>();
@@ -322,7 +317,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     List<DummyInventoryInfoEO> infoCJList = JSONArray.parseArray(infoCJ, DummyInventoryInfoEO.class);//json转list
 
                     //翻译字典code值
-                    disposeData(dummyInventoryInfoEOList);
+                    disposeDataToEn(dummyInventoryInfoEOList);
 
                     //获取数据库和传入同时存在的编号
                     //获取两个的编号
@@ -419,7 +414,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 }else{//基础数据发布过,详情原为空-->有新增,再次发布
                     List<DummyContentChangeEO> list = new ArrayList<>();
                     if(dummyInventoryInfoEOList.size() != 0){
-                        disposeData(dummyInventoryInfoEOList);
+                        disposeDataToEn(dummyInventoryInfoEOList);
                         String info = JSONArray.toJSONString(dummyInventoryInfoEOList);
                         DummyContentChangeEO dummyContentChangeEOInfo = new DummyContentChangeEO();
                         dummyContentChangeEOInfo.setParentId(dummyInventoryBaseEO.getId());
@@ -431,13 +426,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                         iDummyContentChangeEOService.saveBatch(list);
                         sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
 
-                    }/*else {
-                        if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                            throw new JeroBootException("操作成功");
-                        } else {
-                            throw new JeroBootException("Successful operation.");
-                        }
-                    }*/
+                    }
                 }
             }
         }else{
@@ -1063,7 +1052,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
             List<SysUser> sysUsers = sysUserService.listByIds(userIdList);
             List<String> thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList());
             if (userIdList.size() != 0) {
-                String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp;
+                String href = backUrl + "/virtualListDetails?name=" + baseName + "&useExplain=" + useExplain +"&id=" + idTemp +"&title=维护虚拟清单";
 
                 //http://localhost:3000/virtualListDetails?name=66666&useExplain=66&id=1528930716744699905&title=%E7%BB%B4%E6%8A%A4%E8%99%9A%E6%8B%9F%E6%B8%85%E5%8D%95
                 String hrefUrl = "<a href='/virtualListDetails?name=" + baseName +
@@ -1074,16 +1063,21 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
                 String content = null;
                 String contentInfo = null;
+                String contentInfoTemp = null;
+
                 if(InventoryStateEnum.ISSUE.getValue().equals(state)) {
                     //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx
                     content = "The " + baseName + " virtual list you subscribed to has been updated.";
                     contentInfo = "The " + hrefUrl + " virtual list you subscribed to has been updated as follows : " + "\r\n";
+                    contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n";
                     //拼接维护清单的消息
                     contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
+                    contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
 
                 }else{//撤回的消息
                     content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
                     contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
+                    contentInfoTemp = contentInfo;
                 }
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
@@ -1091,7 +1085,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                 bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
                 //飞书
                 try {
-                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), href);
+                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
                 } catch (IOException e) {
                     log.error("飞书消息推送失败");
                 }
@@ -1358,7 +1352,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designInitiator").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
 
@@ -1370,7 +1364,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("designDuty").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
 
@@ -1406,7 +1400,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoInitiator").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
 
@@ -1418,7 +1412,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("prehomoDuty").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
 
@@ -1454,7 +1448,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyInitiator").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";
 
@@ -1466,7 +1460,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) {
                         List<String> list = Arrays.asList(infoDiff.get("verifyDuty").split(","));
                         String infoDiffOld = list.get(0);
-                        String infoDiffNew = "list.get(1)";
+                        String infoDiffNew = list.get(1);
                         if (StringUtils.isBlank(contentLog)) {
                             contentInfo += "'"+DummyInventoryBaseFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ",";