From 82308ad7e35fb2baa77c6cde8a450959d31db494 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 25 Apr 2022 21:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83-=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 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 9531c3121..7a8ead7c8 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
@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -240,16 +241,35 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
                 //3.截止到现在发布,期间修改的数据(基础)
                 //数据为-->dummyInventoryBaseEOList
-
+               String dibName = dummyInventoryBaseEOList.get(0).getName();
+               String dibUseExplain = dummyInventoryBaseEOList.get(0).getUseExplain();
 
                 //4.截止到现在发布,期间修改的数据(详情)
                 //数据为-->dummyInventoryInfoEOList
-
+              List<String> contentJson = Arrays.asList(dummyContentChangeEOInfoList.get(0).getContentJson().split("},\\{"));
+               for(String midCJ:contentJson){
+                   List<String> dccContentJson = Arrays.asList( midCJ.split("\",\""));
+                   System.out.println(dccContentJson);
+               }
 
                 //5.分别对比基础表数据和详情表数据
 
                 //5.1.基础表数据对比
+                List<String> dibContentJson = Arrays.asList(dummyContentChangeEOBaseList.get(0).getContentJson().split("\",\""));
 
+                //获取原虚拟清单名称
+                String cJName = dibContentJson.get(6);
+                String trueCJName = disposeContentJson(cJName);
+                //获取原虚拟清单使用说明
+                String cJUseExplain =  dibContentJson.get(1);
+                String trueCJUseExplain = disposeContentJson(cJUseExplain);
+                //拼接本次发布时的修改信息
+                if(!trueCJName.equals(dibName)) {
+                    String cJNameMessage = dummyInventoryBaseEO.getUpdateBy() + "把" + trueCJName + "改为了" + dibName;
+                }
+                if(!trueCJUseExplain.equals(dibUseExplain)) {
+                    String cJUseExplainMessage = dummyInventoryBaseEO.getUpdateBy() + "把" + trueCJUseExplain + "改为" + dibUseExplain;
+                }
 
                 //5.2详情表数据(一条基础数据可能对应多个详情数据---一对多)
 
@@ -266,4 +286,12 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
 
 
     }
+public String disposeContentJson(String cJName){
+    //获取cntentJson中原数据
+
+    String midCJName = cJName.substring(0, cJName.indexOf(":"));
+    String trueCJName = cJName.substring(midCJName.length()+1, cJName.length()).replace("\"","");
+return  trueCJName;
+}
+
 }