From 673b050757d7d126872ddc9a1e0a52e19425b2f0 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Wed, 20 Jul 2022 17:18:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?=
 =?UTF-8?q?6608=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86-=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E8=AE=A1=E5=88=92=EF=BC=8C=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8D=E6=94=AF=E6=8C=81=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarBussionessStandState/SarBussionessStandStateMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
index 9ecee506..1a7fb075 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml
@@ -94,7 +94,7 @@
         where sar_bussioness_stand.TEXT_STATUS_BUSS = '9z741h2m3j' AND sar_bussioness_stand.ISSUE_TIME IS NOT NULL and sar_bussioness_stand.VALID_FLAG = '0'
         <trim suffixOverrides="," >
             <if test="standCode != null and standCode != '' " >
-                and STAND_CODE like  concat(concat('%',#{standCode}),'%')
+                and (STAND_CODE like  concat(concat('%',#{standCode}),'%') or STAND_NAME like  concat(concat('%',#{standCode}),'%'))
             </if>
             <if test="reviewTimeStart != null and reviewTimeStart != '' and reviewTimeEnd != null and reviewTimeEnd != ''">
                 and DATE_FORMAT(sar_buss_stand_attr_info.FSRQBUSS, '%Y-%m-%d') between DATE_FORMAT(#{reviewTimeStart}, '%Y-%m-%d') AND DATE_FORMAT(#{reviewTimeEnd}, '%Y-%m-%d')

From 29028fb4af4c9dc36eac0690dbefe2565e624a5f Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Thu, 21 Jul 2022 15:49:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?=
 =?UTF-8?q?6624=20=20=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=97=A0=E4=BD=9C=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarLawsAttrDetailedListMapper.xml         | 95 +++++++++++++++----
 1 file changed, 74 insertions(+), 21 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
index e64b06c1..174966fa 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
@@ -145,28 +145,81 @@
 
 
     <select id="selectLawsId" resultType="string">
-        select  stand_id from sar_laws_attr_detailed_list
-        LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
-        <where>
-            <if test="standId != null">
-                and detailed_list_id = #{standId}
-            </if>
-            <if test="sar.standSort != null">
-                and si.STAND_SORT = #{sar.standSort}
-            </if>
-            <if test="sar.standType != null">
-                and si.STAND_TYPE = #{sar.standType}
-            </if>
-            <if test="sar.standNumber != null">
-                and concat(concat(concat(concat(si.STAND_SORT,' '),si.STAND_NUMBER),'-'),si.STAND_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
-                or si.STAND_NAME like concat(concat('%', #{sar.standNumber}),'%')
-            </if>
-            <if test="sar.standName != null">
-                and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')
-            </if>
+            SELECT A.stand_id FROM (
+            select  stand_id,number from sar_laws_attr_detailed_list
+            LEFT JOIN sar_standards_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
+            <where>
+                <if test="standId != null">
+                    and detailed_list_id = #{standId}
+                </if>
+                <if test="sar.standSort != null">
+                    and si.STAND_SORT = #{sar.standSort}
+                </if>
+                <if test="sar.standType != null">
+                    and si.STAND_TYPE = #{sar.standType}
+                </if>
+                <if test="sar.standNumber != null">
+                    and (
+                    (trim(replace(concat(si.STAND_SORT,' ',si.STAND_NUMBER,'-',
+                    si.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{sar.standNumber}),'%'),' ','')) and si.STAND_YEAR != '')
+                    or (trim(replace(concat(si.STAND_SORT,' ',si.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{sar.standNumber}),'%'),' ',''))
+                    )
+                    <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
+                    or (stand_name like concat(concat('%',#{sar.standNumber}),'%')))
+                </if>
+                <if test="sar.standName != null">
+                    and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')
+                </if>
 
-        </where>
-        order by number
+            </where>
+            UNION
+            select  stand_id,number from sar_laws_attr_detailed_list
+            LEFT JOIN sar_bussioness_stand si ON sar_laws_attr_detailed_list.stand_id = si.ID
+            <where>
+                <if test="standId != null">
+                    and detailed_list_id = #{standId}
+                </if>
+                <if test="sar.standSort != null">
+                    and si.STAND_SORT = #{sar.standSort}
+                </if>
+                <if test="sar.standNumber != null">
+                    and (si.STAND_CODE like concat('%', #{sar.standNumber}, '%')
+                    or REPLACE( si.STAND_CODE,' ','') like REPLACE(  concat('%', #{sar.standNumber}, '%'),' ',''))
+                </if>
+                <if test="sar.standName != null">
+                    and si.STAND_NAME like concat(concat('%', #{sar.standName}),'%')
+                </if>
+
+            </where>
+            UNION
+            select  stand_id,number from sar_laws_attr_detailed_list
+            LEFT JOIN sar_laws_stand_info si ON sar_laws_attr_detailed_list.stand_id = si.ID
+            LEFT JOIN TS_DICTYPE dicstandSort ON (
+            dicstandSort.dic_type_code = si.LAWS_TYPE
+            AND dicstandSort.dic_id IS NOT NULL
+            AND dicstandSort.valid_flag = 0
+            AND dicstandSort.PARENT_ID IS NULL
+            )
+            <where>
+                <if test="standId != null">
+                    and detailed_list_id = #{standId}
+                </if>
+                <if test="sar.standSort != null">
+                    and si.LAWS_TYPE = #{sar.standSort}
+                </if>
+                <if test="sar.standNumber != null">
+                    and concat(concat(concat(concat(si.LAWS_TYPE,' '),si.LAWS_NUMBER),'-'),si.LAWS_YEAR) like concat(concat('%', #{sar.standNumber}),'%')
+                    or si.LAWS_NAME like concat(concat('%', #{sar.standNumber}),'%')
+                    or dicstandSort.DIC_TYPE_NAME like concat(concat('%', #{sar.standNumber}),'%')
+                </if>
+                <if test="sar.standName != null">
+                    and si.LAWS_NAME like concat(concat('%', #{sar.standName}),'%')
+                </if>
+
+            </where>
+
+        ) A
+        order by A.number
         LIMIT #{param3} , #{param2};
     </select>