From d336a52a09770e7cd7ca7a3fd627780cbd3b65a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 11 Sep 2024 18:23:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E6=A3=80=E7=B4=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql                              |  6 +++++-
 .../documenttool/mapper/DocumentSplitMapper.java    |  8 ++++++++
 .../documenttool/mapper/xml/DocumentSplitMapper.xml | 10 ++++++++++
 .../service/impl/DocumentSplitServiceImpl.java      | 13 +++++++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 6e62860e..8984185c 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -335,4 +335,8 @@ UPDATE `sys_dict_item` SET `item_text` = '市场法规清单发布流程' WHERE
 -- 2024-09-11 修改外部标准实施日期为多选日期
 UPDATE laws_tag SET `db_length` = 200,`field_show_type` = '4' WHERE `id` = '1695991006579912706';
 ALTER TABLE `laws_domestic_standard`
-    MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期';
\ No newline at end of file
+    MODIFY COLUMN `implementation_date` varchar(200) NULL DEFAULT NULL COMMENT '实施日期';
+
+-- 2024-09-11 外来标准
+ALTER TABLE `laws_domestic_standard`
+    MODIFY COLUMN `applicable_market` longtext NULL DEFAULT NULL COMMENT '适用市场';
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 d0c82e63..0c345c31 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
@@ -232,4 +232,12 @@ public interface DocumentSplitMapper extends BaseMapper<LawsDocumentSplit> {
     List<ProcessStandardInterpretClause> selectClauseList(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
 
     List<ProcessStandardComplianceCheckDetail> selectClauseListScc(@Param("lawsDocumentSplit") LawsDocumentSplit lawsDocumentSplit);
+
+
+    /**
+     * 根据适用市场获取条款id
+     * @param countryList
+     * @return
+     */
+    List<String> getSplitSelectIds(List<String> countryList);
 }
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 3dbcb421..285b2043 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
@@ -316,4 +316,14 @@
             SET ${updateSet}
         WHERE ${updateCondition}
     </update>
+
+    <select id="getSplitSelectIds" resultType="java.lang.String">
+        select l2.id from laws_domestic_standard l1
+        left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
+        where l1.del_flag = 0 and l2.id is not null
+        and
+        <foreach collection="countryList" separator="or" item= "item" open="(" close=")">
+            CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
+        </foreach>
+    </select>
 </mapper>
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 f5ebdb3f..73b18b02 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
@@ -82,6 +82,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.web.util.HtmlUtils;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
@@ -194,6 +195,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
     private static final String MENU_ID = "menu_id";
     private static final String CREATE_TIME = "create_time";
     private static final String SPLIT_STATUS = "split_status";
+    private static final String COUNTRY = "country";
 
     private static final int NUMBER = 500;
 
@@ -1858,6 +1860,17 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
                 parameter.remove(MENU_ID);
             }
         }
+        // 适用市场
+        if (parameter.containsKey(COUNTRY) && !StringUtils.isBlank(parameter.get(COUNTRY).toString())){
+            // 查询市场下的标准
+            List<String> countryList =  Arrays.asList(parameter.get(COUNTRY).toString().split(","));
+            List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
+            if(!CollectionUtils.isEmpty(ids)){
+                // in查询
+                selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
+            }
+            parameter.remove(COUNTRY);
+        }
     }
 
     /**