From 5927d890273b65918c322bf4add8733176b159a7 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 6 Mar 2025 10:20:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/purchase/SupCompanyDao.xml | 45 ++++++++---------
 .../mapper/purchase/SupManufacturerDao.xml    | 48 ++++++++++---------
 .../mybatis/mapper/purchase/SupProductDao.xml | 13 ++---
 3 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
index a6afdb02..2cda07e5 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
@@ -15,48 +15,45 @@
     <select id="filterCompany" parameterType="com.glxp.api.req.purchase.FilterSupCompanyRequest"
             resultType="com.glxp.api.entity.purchase.SupCompanyEntity">
         SELECT
-               *,
-        (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus != 0 ) as 'supCertCount',
-        (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus = 1 ) as 'supCertOkCount',
-        (select count(1) from sup_cert c where sup_company.customerId = c.customerId and type = 1 and auditStatus = 6 ) as 'supCertNotCount'
-        <if test="manufacturerStatus!=null">
-        ,(SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND sup_manufacturer.auditStatus!=1 AND sup_manufacturer.auditStatus!=0  AND sup_manufacturer.auditStatus!=4 ) as failCout,
-        (SELECT count(*) FROM sup_manufacturer WHERE sup_company.customerId=sup_manufacturer.customerId AND (sup_manufacturer.auditStatus=1  OR sup_manufacturer.auditStatus=4) ) as passCout
-            ,(SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId AND sup_product.auditStatus!=0 AND sup_product.auditStatus!=1 AND sup_product.auditStatus!=4 ) as productFailCout,
-            (SELECT count(*) FROM sup_product WHERE sup_company.customerId=sup_product.customerId  AND (sup_product.auditStatus=1 OR sup_product.auditStatus=4)  ) as prouctPassCout
-        </if>
-        FROM sup_company
+                sc.*,
+            COUNT(CASE WHEN c.type = 1 AND c.auditStatus != 0 THEN 1 END) AS supCertCount,
+            COUNT(CASE WHEN c.type = 1 AND c.auditStatus = 1 THEN 1 END) AS supCertOkCount,
+            COUNT(CASE WHEN c.type = 1 AND c.auditStatus = 6 THEN 1 END) AS supCertNotCount,
+            <if test="manufacturerStatus != null">
+                COALESCE(SUM(CASE WHEN sm.auditStatus NOT IN (0, 1, 4) THEN 1 END), 0) AS failCout,
+                COALESCE(SUM(CASE WHEN sm.auditStatus IN (1, 4) THEN 1 END), 0) AS passCout,
+                COALESCE(SUM(CASE WHEN sp.auditStatus NOT IN (0, 1, 4) THEN 1 END), 0) AS productFailCout,
+                COALESCE(SUM(CASE WHEN sp.auditStatus IN (1, 4) THEN 1 END), 0) AS productPassCout
+            </if>
+        FROM  sup_company sc
+        LEFT JOIN sup_cert c ON sc.customerId = c.customerId
         <where>
             <if test="customerId != null and customerId != ''">
-                and customerId = #{customerId}
+                and sc.customerId = #{customerId}
             </if>
             <if test="companyName != null and companyName != ''">
-                and companyName like concat('%',#{companyName},'%')
+                and sc.companyName like concat('%',#{companyName},'%')
             </if>
             <if test="creditNum != null and creditNum != ''">
-                and creditNum like concat('%',#{creditNum},'%')
+                and sc.creditNum like concat('%',#{creditNum},'%')
             </if>
             <if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
-                and auditStatus = #{auditStatus}
+                and sc.auditStatus = #{auditStatus}
             </if>
-
             <if test="auditStatus ==20">
-                and (auditStatus = 0 or auditStatus=5 or auditStatus=2)
+                and (sc.auditStatus = 0 or sc.auditStatus=5 or sc.auditStatus=2)
             </if>
-
             <if test="auditStatus ==21">
-                and <![CDATA[ auditStatus <> 0 ]]>
+                and <![CDATA[ sc.auditStatus <> 0 ]]>
             </if>
-
             <if test="auditStatus ==22">
-                and (auditStatus = 1 or auditStatus=4 )
+                and (sc.auditStatus = 1 or sc.auditStatus=4 )
             </if>
-
             <if test="unitIdFk != null and unitIdFk != ''">
-                and unitIdFk = #{unitIdFk}
+                and sc.unitIdFk = #{unitIdFk}
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and DATE_FORMAT(sc.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
     </select>
diff --git a/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
index b04df4ab..f2a1fed8 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
@@ -19,53 +19,54 @@
 
     <select id="getCompany" parameterType="com.glxp.api.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.api.entity.purchase.SupManufacturerEntity">
-        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
+        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
         </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 id = #{id}
+                and sm.id = #{id}
             </if>
             <if test="manufacturerId != null and manufacturerId != ''">
-                and manufacturerId = #{manufacturerId}
+                and sm.manufacturerId = #{manufacturerId}
             </if>
             <if test="companyName != null and companyName != ''">
-                and sup_manufacturer.companyName like concat('%',#{companyName},'%')
+                and sm.companyName like concat('%',#{companyName},'%')
             </if>
             <if test="creditCode != null and creditCode != ''">
-                and creditCode like concat('%',#{creditCode},'%')
+                and sm.creditCode like concat('%',#{creditCode},'%')
             </if>
             <if test="placeArea != null and placeArea != ''">
-                and placeArea like concat('%',#{placeArea},'%')
+                and sm.placeArea like concat('%',#{placeArea},'%')
             </if>
             <if test="customerId != null and customerId != ''">
-                and sup_manufacturer.customerId = #{customerId}
+                and sm.customerId = #{customerId}
             </if>
-
             <if test="auditStatus != null and auditStatus !=20  and auditStatus !=21 and auditStatus !=22">
-                and sup_manufacturer.auditStatus = #{auditStatus}
+                and sm.auditStatus = #{auditStatus}
             </if>
-
             <if test="auditStatus ==20">
-                and (sup_manufacturer.auditStatus = 0 or sup_manufacturer.auditStatus=5 or
-                sup_manufacturer.auditStatus=2)
+                and (sm.auditStatus = 0 or sm.auditStatus=5 or sm.auditStatus=2)
             </if>
             <if test="auditStatus ==21">
-                and <![CDATA[ sup_manufacturer.auditStatus <> 0 ]]>
+                and <![CDATA[ sm.auditStatus <> 0 ]]>
             </if>
-
             <if test="auditStatus ==22">
-                and (sup_manufacturer.auditStatus = 1 or sup_manufacturer.auditStatus=4 )
+                and (sm.auditStatus = 1 or sm.auditStatus=4 )
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(sup_manufacturer.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and DATE_FORMAT(sm.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="type != null">
-                and id != #{id}
+                and sm.id != #{id}
             </if>
         </where>
     </select>
@@ -134,7 +135,8 @@
 
     <select id="getCompanyByNameAndCode" parameterType="com.glxp.api.req.purchase.FilterSupManufacturerRequest"
             resultType="com.glxp.api.entity.purchase.SupManufacturerEntity">
-        SELECT sup_manufacturer.* ,sup_company.companyName as supName FROM sup_manufacturer
+        SELECT sup_manufacturer.* ,sup_company.companyName as supName
+        FROM sup_manufacturer
         inner join sup_company on sup_manufacturer.customerId = sup_company.customerId
         <where>
             <if test="companyName != null and companyName != ''">
diff --git a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
index 08e74bc2..5b426df1 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
@@ -14,7 +14,6 @@
         SELECT sup_product.id,
                sup_product.productId,
                sup_product.enterpriseId,
-
                sup_product.recordProductName,
                sup_product.productManageType,
                sup_product.recordPeopleName,
@@ -263,13 +262,9 @@
             resultType="java.lang.Integer">
         SELECT count(*)
         FROM sup_product
-                     inner join sup_company
-                on sup_product.customerId = sup_company.customerId
-                     INNER JOIN sup_manufacturer
-                on sup_manufacturer.manufacturerId =
-                   sup_product.manufacturerIdFk
-        WHERE sup_manufacturer.companyName =
-              (SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk})
+        inner join sup_companyon sup_product.customerId = sup_company.customerId
+        INNER JOIN sup_manufactureron sup_manufacturer.manufacturerId =sup_product.manufacturerIdFk
+        WHERE sup_manufacturer.companyName = (SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk} limit 1)
           and recordCode = #{recordCode}
           and recordProductName = #{recordProductName}
           and sup_product.customerId = #{customerId}
@@ -285,7 +280,7 @@
             resultType="com.glxp.api.entity.purchase.SupProductEntity">
         select sup_product.*
         from sup_product
-                     INNER JOIN sup_manufacturer on sup_product.manufacturerIdFk = sup_manufacturer.manufacturerId
+        INNER JOIN sup_manufacturer on sup_product.manufacturerIdFk = sup_manufacturer.manufacturerId
         WHERE sup_manufacturer.companyName = #{manufactory}
           and sup_product.recordProductName = #{cpmctymc}
           and sup_product.customerId = #{customerId}