From da1910fc60840e588f0295668dcfb7dfbf4aeb23 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 7 Sep 2024 18:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=89=8B=E6=8C=81bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/quality/service/impl/QcProCheckServiceImpl.java   | 5 +++++
 .../src/main/resources/mapper/quality/QcProCheckMapper.xml   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
index 25f57833..08c3cebd 100644
--- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
+++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java
@@ -128,6 +128,11 @@ public class QcProCheckServiceImpl implements QcProCheckService {
     @Override
     public List<QcCheckTaskIncome> getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) {
         DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode());
+        if("'0'".equals(qcCheckTaskIncome.getCheckStatus())){
+            qcCheckTaskIncome.setDelFlag("0");//临时借用
+        }else{
+            qcCheckTaskIncome.setDelFlag("1");
+        }
         List<QcCheckTaskIncome> dtos = qcProCheckMapper.getCheckTaskList(qcCheckTaskIncome);
         for (QcCheckTaskIncome dto : dtos) {
             if (StringUtils.isEmpty(dto.getWorkorderCodeSap())) {
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 68f36fb0..24928885 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
@@ -276,9 +276,9 @@
             <if test="checkTimeStart != null  and checkTimeStart != ''">and CONVERT(varchar(10),qct.check_time, 120) = #{checkTimeStart}</if>
             <if test="checkManCode != null  and checkManCode != ''">and qctu.check_man_code = #{checkManCode}</if>
             <if test="checkStatus != null and checkStatus != ''">and qct.check_status in (${checkStatus})</if>
-
+            <if test="delFlag == '0'">
             and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
-
+            </if>
         </where>
         order by qct.create_time desc
     </select>