From 6b3d87c8904a006615fcab0f6d3287c942260fd8 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Mon, 6 Dec 2021 14:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandUnqualifiedMapper.xml             | 73 +++++++++++++++++--
 1 file changed, 67 insertions(+), 6 deletions(-)

diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
index a0970a42..20c72636 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
@@ -31,7 +31,7 @@
     </select>
 
 
-    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+    <select id="getSarStandUnqualifiedPageNew" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
         SELECT
         sar_stand_unqualified.*, sar_standards_info.STAND_TYPE as standType
         from
@@ -49,14 +49,45 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
         order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         limit #{start},#{end}
     </select>
 
-    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+    <select id="getSarStandUnqualifiedPage" resultType="com.adc.da.slrs.sarStandUnqualified.entity.SarStandUnqualified">
+        SELECT
+        c.*
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+            SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+            sar_stand_unqualified,(SELECT @i:=0)j
+            WHERE
+            close_state = 1
+            <if test="sar.standId != null and sar.standId != '' ">
+                and STAND_ID = #{standId}
+            </if>
+            <if test="sar.productName != null and sar.productName != '' ">
+                and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+            </if>
+            <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+                and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+            </if>
+            <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+                and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+                or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+            </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        limit #{start},#{end}
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
+
+    <select id="getSarStandUnqualifiedCountNew" resultType="java.lang.Integer">
         SELECT
          count(sar_stand_unqualified.ID)
         from
@@ -74,8 +105,38 @@
             and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and STAND_SERIAL_NUMBER like concat(concat('%',#{sar.standSerialNumber}),'%')
-            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%')
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
         </if>
     </select>
+
+    <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
+        SELECT
+        count(c.ID)
+        FROM
+        (
+        SELECT b.*,sar_standards_info.STAND_TYPE as standType FROM (
+        SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.*  FROM
+        sar_stand_unqualified,(SELECT @i:=0)j
+        WHERE
+        close_state = 1
+        <if test="sar.standId != null and sar.standId != '' ">
+            and STAND_ID = #{standId}
+        </if>
+        <if test="sar.productName != null and sar.productName != '' ">
+            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+        </if>
+        <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
+            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+        </if>
+        <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
+            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
+        </if>
+        order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
+        )b
+        left join sar_standards_info on b.STAND_ID = sar_standards_info.id
+        )c
+        ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
+    </select>
 </mapper>