From 492a5e96223df40b70ab65844c20366c75f47189 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 5 Dec 2021 19:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E5=8F=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandardsInfoMapper.xml                | 43 +++++++++++++------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index a5215c4e..15a28204 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -441,10 +441,11 @@
             <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
                 and (
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{standNumber}),'%')
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+                )
+                <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
                 or (stand_name like concat(concat('%',#{standNumber}),'%'))
                 )
             </if>
@@ -757,8 +758,9 @@
                 (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
                 SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
                 or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
-             <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
+                )
+                <!--  and SAR_STANDARDS_INFO.STAND_YEAR = ''-->
+               <!--    or (stand_name like concat(concat('%',#{page.standNumber}),'%')) -->
                 )
             </if>
             <!-- 标准名称 -->
@@ -884,9 +886,14 @@
             </if>
             <!-- 标准编号111 -->
             <if test="standNumber != null and standNumber != ''">
-                and
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                and (
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),
+                ' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like
+                trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+                )
+                )
             </if>
             <!-- 标准名称 -->
             <if test="standName != null and standName != ''">
@@ -1038,16 +1045,28 @@
         </if>
         <if test="standNumber != null">
             and (
+            (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+            SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+            or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{standNumber}),'%'),' ',''))
+            )
+            <!-- and SAR_STANDARDS_INFO.STAND_YEAR = '' -->
+            or (stand_name like concat(concat('%',#{standNumber}),'%'))
+            )
+
+
+
+           <!-- and (
                 ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
                 and
                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
                 and
-                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%')  and SAR_STANDARDS_INFO.STAND_YEAR != '' )
                 or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
                 and
                 ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
-                and SAR_STANDARDS_INFO.STAND_YEAR = '')
-            )
+                )
+                and SAR_STANDARDS_INFO.STAND_YEAR = ''
+            ) -->
         </if>
         <if test="sychronId != null">
             and id != #{sychronId}