From 97a07669eab15d0a05762546a1bd50ad287a7e93 Mon Sep 17 00:00:00 2001
From: qiuyt <zane0312@foxmail.com>
Date: Wed, 19 Mar 2025 15:38:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E9=98=B3=E9=97=AE=E9=A2=98-=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=AE=A1=E6=A0=B8=E4=B9=8B=E5=89=8D=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84sql=E4=B8=8D=E5=8F=AF=E4=BB=A5=E7=94=A8=E6=81=A2?=
 =?UTF-8?q?=E5=A4=8D=E5=8E=9F=E6=9D=A5=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/basic/YbNotCodeController.java | 10 ++---
 .../mybatis/mapper/purchase/SupCompanyDao.xml | 45 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/basic/YbNotCodeController.java b/src/main/java/com/glxp/api/controller/basic/YbNotCodeController.java
index b901cf6e..16d3e028 100644
--- a/src/main/java/com/glxp/api/controller/basic/YbNotCodeController.java
+++ b/src/main/java/com/glxp/api/controller/basic/YbNotCodeController.java
@@ -42,7 +42,7 @@ import java.util.Objects;
 public class YbNotCodeController {
     @Resource
     YbNotCodeServiceImpl ybNotCodeService;
-    @PostMapping("/udispms/ybNotCode/page")
+    @PostMapping("/udi/ybNotCode/page")
     public BaseResponse page(@RequestBody YbNotCodeQuery query) {
         List<YbNotCode> list = ybNotCodeService.pageList(query);
         PageInfo pageInfo = new PageInfo<>(list);
@@ -52,19 +52,19 @@ public class YbNotCodeController {
         return ResultVOUtils.success(page);
     }
 
-    @PostMapping("/udispms/ybNotCode/add")
+    @PostMapping("/udi/ybNotCode/add")
     public BaseResponse add(@RequestBody YbNotCode ybNotCode) {
         return ResultVOUtils.success(ybNotCodeService.add(ybNotCode));
     }
-    @PostMapping("/udispms/ybNotCode/update")
+    @PostMapping("/udi/ybNotCode/update")
     public BaseResponse update(@RequestBody YbNotCode ybNotCode) {
         return ResultVOUtils.success(ybNotCodeService.update(ybNotCode));
     }
-    @PostMapping("/udispms/ybNotCode/delete")
+    @PostMapping("/udi/ybNotCode/delete")
     public BaseResponse delete(@RequestBody YbNotCode ybNotCode) {
         return ResultVOUtils.success(ybNotCodeService.delete(ybNotCode));
     }
-    @GetMapping("/udispms/ybNotCode/export")
+    @GetMapping("/udi/ybNotCode/export")
     public void export( YbNotCodeQuery query,HttpServletResponse response) throws IOException {
         List<YbNotCode> list;
         if(query.getExcelType() !=null && query.getExcelType() == 1
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
index 2cda07e5..1772e3d8 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml
@@ -15,45 +15,48 @@
     <select id="filterCompany" parameterType="com.glxp.api.req.purchase.FilterSupCompanyRequest"
             resultType="com.glxp.api.entity.purchase.SupCompanyEntity">
         SELECT
-                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
+        *,
+        (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
         <where>
             <if test="customerId != null and customerId != ''">
-                and sc.customerId = #{customerId}
+                and customerId = #{customerId}
             </if>
             <if test="companyName != null and companyName != ''">
-                and sc.companyName like concat('%',#{companyName},'%')
+                and companyName like concat('%',#{companyName},'%')
             </if>
             <if test="creditNum != null and creditNum != ''">
-                and sc.creditNum like concat('%',#{creditNum},'%')
+                and creditNum like concat('%',#{creditNum},'%')
             </if>
             <if test="auditStatus != null and auditStatus !=20 and auditStatus !=21 and auditStatus !=22">
-                and sc.auditStatus = #{auditStatus}
+                and auditStatus = #{auditStatus}
             </if>
+
             <if test="auditStatus ==20">
-                and (sc.auditStatus = 0 or sc.auditStatus=5 or sc.auditStatus=2)
+                and (auditStatus = 0 or auditStatus=5 or auditStatus=2)
             </if>
+
             <if test="auditStatus ==21">
-                and <![CDATA[ sc.auditStatus <> 0 ]]>
+                and <![CDATA[ auditStatus <> 0 ]]>
             </if>
+
             <if test="auditStatus ==22">
-                and (sc.auditStatus = 1 or sc.auditStatus=4 )
+                and (auditStatus = 1 or auditStatus=4 )
             </if>
+
             <if test="unitIdFk != null and unitIdFk != ''">
-                and sc.unitIdFk = #{unitIdFk}
+                and unitIdFk = #{unitIdFk}
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                <![CDATA[   and DATE_FORMAT(sc.updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[   and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
         </where>
     </select>