From b5f0318d56cd63a3c0ccfea7177baefe359d2bf0 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Tue, 24 May 2022 10:50:17 +0800
Subject: [PATCH] =?UTF-8?q?bug52732=E5=8F=91=E5=B8=83=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 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 d91355e15..dda908be7 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
@@ -270,6 +270,11 @@ 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<>();
@@ -407,11 +412,28 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                             dummyContentChangeEOMapper.update(null,infoUpdateWrapper);
                         }
                     }
-                }else{
-                    if(CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
-                        throw new JeroBootException("维护清单为空,发布失败");
-                    }else{
-                        throw new JeroBootException("The maintenance list is empty, and publishing failed.");
+                }else{//基础数据发布过,详情原为空-->有新增,再次发布
+                    List<DummyContentChangeEO> list = new ArrayList<>();
+                    if(dummyInventoryInfoEOList.size() != 0){
+                        disposeData(dummyInventoryInfoEOList);
+                        String info = JSONArray.toJSONString(dummyInventoryInfoEOList);
+                        DummyContentChangeEO dummyContentChangeEOInfo = new DummyContentChangeEO();
+                        dummyContentChangeEOInfo.setParentId(dummyInventoryBaseEO.getId());
+                        dummyContentChangeEOInfo.setContentJson(info);
+                        list.add(dummyContentChangeEOInfo);
+                    }
+                    if(list.size() != 0){
+                        String addSerialNumber = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.joining(","));
+                        iDummyContentChangeEOService.saveBatch(list);
+                        sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
+                       // private void sendMsg(Map<String, String> baseDiff, String idTemp,List<Map<String, String>> infoDiffList,
+                       //         String addSerialNumber,String deleteSerialNumber,String state,String cut) {
+                    }else {
+                        if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                            throw new JeroBootException("维护清单为空,发布失败");
+                        } else {
+                            throw new JeroBootException("The maintenance list is empty, and publishing failed.");
+                        }
                     }
                 }
             }