From abc649aef4169be0016487299245e613e49a026d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 7 Sep 2024 17:18:43 +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=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/plan/service/impl/ProOrderServiceImpl.java    | 3 +++
 .../main/resources/mapper/quality/QcProCheckMapper.xml   | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index 93886371..d068bcff 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -762,6 +762,9 @@ public class ProOrderServiceImpl implements IProOrderService {
     @DS("#header.poolName")
     public List<CascaderDTO> getProEquipment(String routeCode) {
         List<CascaderDTO> level= proOrderMapper.getRouteProcess(routeCode);
+        if(CollectionUtils.isEmpty(level)){
+            return null;
+        }
         List<CascaderDTO> level2= proOrderMapper.getRouteProcessEquips(level);
         Map<String,CascaderDTO> equipMap = new HashMap<>();//设备字典
         if(!CollectionUtils.isEmpty(level2)){
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 841240a6..c7273d18 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
@@ -275,11 +275,10 @@
             <if test="checkType != null  and checkType != ''">and qct.check_type = #{checkType}</if>
             <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>
-            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, -1, GETDATE()), 120)
-                )
+            <if test="checkStatus != null and checkStatus != ''">and qct.check_status in (${checkStatus})</if>
+            <if test="checkStatus == null or checkStatus == ''">
+            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>