From 43d9b8e9026d3f3a50305531838256c9297bbe66 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Thu, 20 Mar 2025 15:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E9=98=B3=E9=97=AE=E9=A2=98-=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E5=AF=BC=E8=87=B4sql=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/purchase/SupManufacturerDao.xml    | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
index f2a1fed8..a7146844 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
@@ -19,54 +19,53 @@
 
     <select id="getCompany" parameterType="com.glxp.api.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.api.entity.purchase.SupManufacturerEntity">
-        SELECT
-            sm.*,
-            sc.companyName AS supName,
-            <if test="productStatus != null">
-            COALESCE(SUM(CASE WHEN sp.auditStatus NOT IN (0, 1, 4) THEN 1 END), 0) AS failCout,
-            COALESCE(SUM(CASE WHEN sp.auditStatus IN (1, 4) THEN 1 END), 0) AS passCout
-            </if>
-        FROM sup_manufacturer sm
-        INNER JOIN sup_company sc ON sm.customerId = sc.customerId
-        <if test="productStatus != null">
-        LEFT JOIN sup_product sp ON sm.customerId = sp.customerId AND sm.manufacturerId = sp.manufacturerIdFk
+        SELECT sup_manufacturer.* ,sup_company.companyName as supName
+        <if test="productStatus!=null">
+            ,(SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk ) as failCout,
+            (SELECT count(*) FROM sup_product WHERE sup_manufacturer.customerId=sup_product.customerId  AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4) AND sup_manufacturer.manufacturerId=sup_product.manufacturerIdFk  ) as passCout
         </if>
+        FROM sup_manufacturer
+        inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
         <where>
             <if test="id != null and id != '' and type==null">
-                and sm.id = #{id}
+                and id = #{id}
             </if>
             <if test="manufacturerId != null and manufacturerId != ''">
-                and sm.manufacturerId = #{manufacturerId}
+                and manufacturerId = #{manufacturerId}
             </if>
             <if test="companyName != null and companyName != ''">
-                and sm.companyName like concat('%',#{companyName},'%')
+                and sup_manufacturer.companyName like concat('%',#{companyName},'%')
             </if>
             <if test="creditCode != null and creditCode != ''">
-                and sm.creditCode like concat('%',#{creditCode},'%')
+                and creditCode like concat('%',#{creditCode},'%')
             </if>
             <if test="placeArea != null and placeArea != ''">
-                and sm.placeArea like concat('%',#{placeArea},'%')
+                and placeArea like concat('%',#{placeArea},'%')
             </if>
             <if test="customerId != null and customerId != ''">
-                and sm.customerId = #{customerId}
+                and sup_manufacturer.customerId = #{customerId}
             </if>
+
             <if test="auditStatus != null and auditStatus !=20  and auditStatus !=21 and auditStatus !=22">
-                and sm.auditStatus = #{auditStatus}
+                and sup_manufacturer.auditStatus = #{auditStatus}
             </if>
+
             <if test="auditStatus ==20">
-                and (sm.auditStatus = 0 or sm.auditStatus=5 or sm.auditStatus=2)
+                and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus=5 or
+                sup_manufacturer.auditStatus=2)
             </if>
             <if test="auditStatus ==21">
-                and <![CDATA[ sm.auditStatus <> 0 ]]>
+                and <![CDATA[ sup_manufacturer.auditStatus <> 0 ]]>
             </if>
+
             <if test="auditStatus ==22">
-                and (sm.auditStatus = 1 or sm.auditStatus=4 )
+                and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(sm.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="type != null">
-                and sm.id != #{id}
+                and id != #{id}
             </if>
         </where>
     </select>
@@ -160,4 +159,4 @@
         </where>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>