From 1115c812442ca2adcf39c60004f1cf17124b1ddd Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 24 Dec 2021 11:12:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SarStandUnqualifiedMapper.xml             | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 cf9bb389..5d0c2271 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
@@ -66,30 +66,30 @@
 
     <select id="getSarStandUnqualifiedCount" resultType="java.lang.Integer">
         SELECT
-        count(c.ID)
+        count(*)
         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
+        SELECT  (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , concat(ts_user.UNAME,concat('(',concat(ts_user.USID,')'))) as dutyEngineerName , ts_institution.name as responsibleUnit FROM
+        (sar_stand_unqualified,(SELECT @i:=0)j)
+        left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
+        left join ts_user on ts_user.USID = sar_stand_unqualified.DUTY_ENGINEER
+        left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
         WHERE
-        close_state = #{sar.closeState}
+        sar_stand_unqualified.close_state = #{sar.closeState}
         <if test="sar.standId != null and sar.standId != '' ">
-            and STAND_ID = #{sar.standId}
+            and sar_stand_unqualified.STAND_ID = #{sar.standId}
         </if>
         <if test="sar.productName != null and sar.productName != '' ">
-            and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
+            and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
         </if>
         <if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
-            and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
+            and ts_institution.name like concat('%',#{sar.responsibleUnit},'%')
         </if>
         <if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
-            and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
+            and (REPLACE(sar_stand_unqualified.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
+        order by sar_stand_unqualified.ID,sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
         )c
         ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
     </select>