From f76f8f4418db8e1db3181b6bbb5acab2911b63e2 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Wed, 18 Oct 2023 09:10:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86):=20?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/DocumentSplitMapper.java           |  6 +++
 .../mapper/xml/DocumentSplitMapper.xml        | 17 +++++++++
 .../impl/DocumentSplitServiceImpl.java        | 38 +++++++++++++++----
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
index 94f31c0b..30c45c98 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/DocumentSplitMapper.java
@@ -117,4 +117,10 @@ public interface DocumentSplitMapper {
      * @return
      */
     int insertLawsDocumentSplit(@Param("insertField") String insertField, @Param("insertValue") String insertValue);
+
+    /**
+     * 条目批量删除根据itemId
+     * @param itemIds
+     */
+    int deleteItemsValByItemIds(@Param("itemIds") String itemIds, @Param("type") String type);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 62ca58ef..e6620d90 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -57,6 +57,23 @@
         </if>
     </delete>
 
+    <delete id="deleteItemsValByItemIds">
+        delete from sar_file_split_items_val
+        where item_id in
+        <foreach collection="itemIds.split(',')" item="item" separator="or" open="(" close=")">
+            #{item}
+        </foreach>
+
+        <choose>
+            <when test="type != null and type != ''">
+                and type = #{type}
+            </when>
+            <otherwise>
+                and type <![CDATA[<>]]> 'interpretation'
+            </otherwise>
+        </choose>
+    </delete>
+
     <select id="queryByPage" resultType="com.jero.modules.laws.documenttool.entity.DocumentSplitInfo">
         select *
         from (select i.id as id,
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 1b1380a7..793660b4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -76,6 +76,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     private static final String ITEM_TITLE = "item_title";
     private static final String ITEM_CONTENT = "item_content";
     private static final String INTERPRETATION_ARTICLES = "interpretation_articles";
+    private static final String INTERPRETATION_ARTICLES_LIST = "interpretationArticlesList";
     private static final String MENU_ID = "menu_id";
     public DocumentSplitServiceImpl(DocumentSplitMapper documentSplitMapper,
                                     ISarFileSplitInfoService sarFileSplitInfoService,
@@ -179,10 +180,9 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         List<SarFileSplitItemsValEO> valList = JSON.parseArray(JSON.toJSONString(parameter.get("itemValEOList")), SarFileSplitItemsValEO.class);
         parameter.remove("itemValEOList");
         // 条文解读
-        List<SarFileSplitItemsValEO> articlesList = JSON.parseArray(JSON.toJSONString(parameter.get("interpretationArticlesList")), SarFileSplitItemsValEO.class);
-        parameter.remove("interpretationArticlesList");
+        List<SarFileSplitItemsValEO> articlesList = JSON.parseArray(JSON.toJSONString(parameter.get(INTERPRETATION_ARTICLES_LIST)), SarFileSplitItemsValEO.class);
+        parameter.remove(INTERPRETATION_ARTICLES_LIST);
 
-        // 计数
         parameter.forEach((k, v) ->{
             // 条文内容拼接
             if (ITEM_CONTENT.equals(k)){
@@ -209,14 +209,19 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         //条文解读更新
         // 删除旧数据
         documentSplitMapper.deleteItemsValByItemId((String) parameter.get(ID), DocumentSplitCommon.INTERPRETATION);
-        // 添加新数据
-        documentSplitMapper.addBatchItemsVal(articlesList);
+        if (!Objects.isNull(articlesList) && !articlesList.isEmpty()){
+            // 添加新数据
+            documentSplitMapper.addBatchItemsVal(articlesList);
+        }
+
 
         // 条目信息更新
         // 删除旧数据
         documentSplitMapper.deleteItemsValByItemId((String) parameter.get(ID), "");
-        // 添加新数据
-        documentSplitMapper.addBatchItemsVal(valList);
+        if (!Objects.isNull(valList) && !valList.isEmpty()){
+            // 添加新数据
+            documentSplitMapper.addBatchItemsVal(valList);
+        }
     }
 
     private String articlesJoin(List<SarFileSplitItemsValEO> articlesList, String itemId) {
@@ -298,7 +303,16 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                 .equals(v.getIsShowFormCreate())).collect(Collectors.toList());
         List<LawsTag> finalFieldList = fieldList;
         StringBuilder updateSet = new StringBuilder();
+
+        // 条文解读
+        List<SarFileSplitItemsValEO> articlesList = JSON.parseArray(JSON.toJSONString(parameter.get(INTERPRETATION_ARTICLES_LIST)), SarFileSplitItemsValEO.class);
+        parameter.remove(INTERPRETATION_ARTICLES_LIST);
+
         parameter.forEach((k, v) -> {
+            // 条文解读
+            if (INTERPRETATION_ARTICLES.equals(k)){
+                v = articlesJoin(articlesList, (String) parameter.get(ID));
+            }
             // 修改字段
             String updateValue = getUpdateValue(finalFieldList, k, (String) v);
             if (StringUtils.isNotBlank(updateValue)){
@@ -314,12 +328,20 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
         if (parameter.containsKey("ids")){
             String ids = (String) parameter.get("ids");
             List<String> list = Arrays.asList(ids.split(","));
-            updateCondition = "id in " + "'" + String.join(",", list) + "'";
+            updateCondition = "id in ('" + String.join(",", list) + "')";
         }else {
             String infoId = (String) parameter.get(INFO_ID);
             updateCondition = "info_id = " + "'" + infoId + "'";
         }
         documentSplitMapper.editDocumentSplitDetail(updateSet.toString(), updateCondition);
+
+        // 条文解读更新
+        // 删除旧数据
+        documentSplitMapper.deleteItemsValByItemIds((String) parameter.get(ID), DocumentSplitCommon.INTERPRETATION);
+        if (!Objects.isNull(articlesList) && !articlesList.isEmpty()){
+            // 添加新数据
+            documentSplitMapper.addBatchItemsVal(articlesList);
+        }
     }
 
     @Override