From 4c6168cf60426dc1e9c95d575c5efc66bf8d9af9 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 03 六月 2026 18:08:57 +0800
Subject: [PATCH] 生产报工更新实际开始时间和结束时间

---
 src/main/resources/mapper/quality/QualityInspectMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index a9ebc19..7b883c3 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -43,7 +43,11 @@
         <if test="qualityInspect.entryDateEnd != null and qualityInspect.entryDateEnd != '' ">
             AND qi.check_time &lt;= DATE_FORMAT(#{qualityInspect.entryDateEnd},'%Y-%m-%d')
         </if>
-        ORDER BY qi.check_time DESC
+        ORDER BY
+        CASE WHEN qi.check_result IS NULL OR qi.check_result = '' THEN 0 ELSE 1 END,
+        inspect_state,
+        qi.check_time DESC,
+        qi.id DESC
     </select>
 
     <select id="qualityInspectExport" resultType="com.ruoyi.quality.pojo.QualityInspect">

--
Gitblit v1.9.3