From c9de421ff4ca75604866ecdb08226410ed39cf43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Tue, 21 Oct 2025 16:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quality/QcStaticTableMapper.xml        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
index 019c7f337..32ed4fff6 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml
@@ -20,7 +20,7 @@
                 #{supplierCode}
             </foreach>
         </if>-->
-        select DISTINCT qct.supplier_code supplierCode,
+        select DISTINCT qct.supplier_code supplierCode,qct.unit,
               qct.supplier_name supplierName
         from qc_check_task qct
         LEFT JOIN base_supplier bs ON bs.supplier_code = qct.supplier_code
@@ -56,11 +56,14 @@
     <select id="selectNumMap" resultType="com.op.quality.domain.QcStaticTable">
         SELECT
         qct.supplier_code supplierCode,qct.supplier_name supplierName,
-        sum(qct.noOk_quality) noOkNums
+        sum(qct.quality) noOkNums
         from qc_check_task qct
         where qct.type_code = #{qc.typeCode}
         and qct.del_flag = '0'
         and CONVERT(varchar(7),qct.income_time, 120) = #{qc.yearMonth}
+        <if test="qc.checkResult != null">
+            and qct.check_result = #{qc.checkResult}
+        </if>
         <if test="codes != null and codes.size()>0">
             and qct.supplier_code in
             <foreach collection="codes" item="item" index="index" separator="," open="(" close=")">
@@ -1355,7 +1358,7 @@
                  from qc_check_task qct
                   left join qc_check_task_defect qctd on qct.record_id = qctd.belong_to
                   left join qc_defect_type_class qdtc on qdtc.id = qctd.class_id
-                 where qct.del_flag = '0' and qdtc.class_name is not null --and qct.check_type ='checkTypeSC'
+                 where qct.del_flag = '0' and qdtc.class_name is not null and qct.check_type ='checkTypeCPPC'
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>
@@ -1372,7 +1375,7 @@
                  from qc_check_task qct
                           left join qc_check_task_defect qctd on qct.record_id = qctd.belong_to
                           left join qc_defect_type_class qdtc on qdtc.id = qctd.class_id
-                 where qct.del_flag = '0' and qdtc.class_name is not null --and qct.check_type ='checkTypeSC'
+                 where qct.del_flag = '0' and qdtc.class_name is not null and qct.check_type ='checkTypeCPPC'
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>
@@ -1385,7 +1388,7 @@
                      CONVERT(varchar(10),qct.create_time, 120) ymdms,
                      check_result
                  from qc_check_task qct
-                 where qct.del_flag = '0'  --and qct.check_type ='checkTypeSC'
+                 where qct.del_flag = '0'  and qct.check_type ='checkTypeCPPC'
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>
@@ -1397,7 +1400,7 @@
                      CONVERT(varchar(10),qct.create_time, 120) ymdms,
                      sample_quality
                  from qc_check_task qct
-                 where qct.del_flag = '0'  --and qct.check_type ='checkTypeSC'
+                 where qct.del_flag = '0'  and qct.check_type ='checkTypeCPPC'
                    and CONVERT(varchar(7),qct.create_time, 120) = #{yearMonth}
              ) t group by t.ymdms
     </select>