From 4989e77189bbed2322c16ed38e60e4a960ef2fca Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 24 七月 2025 15:03:44 +0800
Subject: [PATCH] yys  添加分析数据算法修改,表新增字段

---
 cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
index e47b813..aa500be 100644
--- a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
@@ -5,7 +5,8 @@
         select * from (
         SELECT cqmd.*,
         CASE
-        WHEN cqmder.is_finish = 1 THEN 2
+        WHEN cqmder.is_finish = 1 THEN 3
+        WHEN cqmder.is_finish = 0 THEN 2
         WHEN cqmder.quality_monitor_details_id IS NOT NULL THEN 1
         ELSE 0 END details_ratify_status,
         CASE
@@ -28,5 +29,12 @@
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}
         </if>
+        order by quality_monitor_id, monitor_purpose, -- 鎻愬彇骞翠唤
+        CAST(SUBSTRING(planned_time, 1, 4) AS SIGNED) ASC,
+        -- 鎻愬彇鏈堜唤
+        CASE
+        WHEN planned_time LIKE '% - %' THEN 1
+        ELSE CAST(SUBSTRING_INDEX(SUBSTRING(planned_time, 6), '鏈�', 1) AS SIGNED)
+        END ASC
     </select>
 </mapper>

--
Gitblit v1.9.3