From a40830b1c6f6731d6ceda5968cdce0b962a56306 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Thu, 16 Nov 2023 15:06:59 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/mapper/xml/LawsCommonMapper.xml   | 15 ++++++++++++---
 .../common/vo/ManyStandardSelectionBoxVO.java     |  3 +++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
index 590ad14b..e37feb2e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
@@ -49,7 +49,7 @@
 
     <select id="getManyStandardSelectionBox"
             resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
-        SELECT id, standard_number, standard_name, release_date, standard_state, source, create_time
+        SELECT standard.id, standard.standard_number, standard.standard_name, standard.release_date, standard.standard_state, standard.source, standard.create_time
         FROM
         (SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source, create_time
         FROM laws_domestic_standard
@@ -66,9 +66,18 @@
         SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source, create_time
         FROM laws_enterprise_standard
         WHERE del_flag = 0) standard
+        <if test="vo.releaseSplitFlag != null and vo.releaseSplitFlag != ''">
+            RIGHT JOIN sar_file_split_info split ON split.standard_id = standard.id
+        </if>
         <where>
+        <if test="vo.releaseSplitFlag != null and vo.releaseSplitFlag != ''">
+            AND standard.id IS NOT NULL
+            AND split.del_flag = 0
+            AND split.publish_before_id IS NOT NULL AND split.publish_before_id != ''
+            AND split.file_type IS NOT NULL AND split.file_type != ''
+        </if>
         <if test="vo.source != null and vo.source != ''">
-            AND source = #{vo.source}
+            AND #{vo.source} LIKE CONCAT('%', standard.source, '%')
         </if>
         <if test="vo.standardNumberOrName != null and vo.standardNumberOrName != ''">
             AND (standard_number LIKE CONCAT('%', #{vo.standardNumberOrName}, '%') OR
@@ -81,7 +90,7 @@
             AND standard_number NOT LIKE CONCAT('%', #{vo.excludeStandardNumbers}, '%')
         </if>
         </where>
-        ORDER BY create_time DESC
+        ORDER BY standard.create_time DESC
     </select>
     <select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
         SELECT id, standard_number, standard_name, release_date, standard_state
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java
index 77d7b892..7626edcb 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/vo/ManyStandardSelectionBoxVO.java
@@ -25,4 +25,7 @@ public class ManyStandardSelectionBoxVO {
 
     @ApiModelProperty(value = "排除的标准号（多个则逗号分隔）")
     private java.lang.String excludeStandardNumbers;
+
+    @ApiModelProperty(value = "发布状态的拆分稿-标识")
+    private String releaseSplitFlag;
 }