From 6c64b4cd8ecb0605cb1887801afde10ee1864087 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 27 May 2025 22:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=89=8B=E6=8C=8115=E5=A4=A9=E5=86=85=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/quality/QcCheckTypeMapper.xml         | 16 ++++++++++++++++
 .../mapper/quality/QcProCheckMapper.xml          |  7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
index 17d639b7e..39e3cd957 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeMapper.xml
@@ -54,7 +54,23 @@
                     CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
                 or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)
             )
+		  and qct.check_type != 'checkTypeCP'
 		group by qct.check_type,qc.check_name
+        union all
+        select qct.check_type checkType,
+               qc.check_name checkName,
+               count(0) taskNum,
+               '检验任务' attr1
+        from qc_check_task qct
+                 left join qc_check_type qc on qct.check_type = qc.order_code
+                 left join qc_check_task_user qctu on qctu.belong_to = qct.record_id
+        where qct.check_status = '0' and qctu.check_man_code = #{checkManCode}
+          and (
+                    CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),GETDATE(), 120)
+                or CONVERT(varchar(10),qct.create_time, 120) = CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120)
+            )
+          and qct.check_type = 'checkTypeCP'
+        group by qct.check_type,qc.check_name
         union all
 		select '','',
 		       count(0) taskNum,
diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
index bfabb4ed2..65e5fece7 100644
--- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
+++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml
@@ -286,8 +286,11 @@
                  qct.material_code like concat('%', #{materialCode},'%') or qct.material_name like concat('%', #{materialCode},'%')
                 )
             </if>
-            <if test='delFlag == "0"'>
-            and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+            <if test='delFlag == "0" and checkType!="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+            </if>
+            <if test='delFlag == "0" and checkType=="checkTypeCP"'>
+                and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -15, GETDATE()), 120))
             </if>
         </where>
         order by qct.create_time desc