From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
index 0617ad7..aa500be 100644
--- a/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualityMonitorDetailsMapper.xml
@@ -1,14 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.process.mapper.QualityMonitorDetailsMapper">
- <select id="pageQualityMonitorDetail" resultType="com.ruoyi.process.pojo.QualityMonitorDetails">
+ <select id="pageQualityMonitorDetail" resultType="com.ruoyi.process.dto.QualityMonitorDetailsDto">
select * from (
- select *
- from cnas_quality_monitor_details
- order by quality_monitor_details_id
+ SELECT cqmd.*,
+ CASE
+ 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
+ WHEN cqmd.ratify_status = 1 THEN 3
+ WHEN cqmd.ratify_status = 0 THEN 2
+ WHEN cqmd.finish_report_url IS NOT NULL THEN 1
+ ELSE 0 END report_status,
+ CASE
+ WHEN cqmde.is_finish = 1 THEN 3
+ WHEN cqmde.ratify_user_id IS NOT NULL THEN 2
+ WHEN cqmde.implement_user_id IS NOT NULL and cqmde.details_evaluate_id is not null THEN 1
+ ELSE 0 END evaluate_status
+ FROM cnas_quality_monitor_details cqmd
+ LEFT JOIN cnas_quality_monitor_details_evaluate cqmde
+ ON cqmd.quality_monitor_details_id = cqmde.quality_monitor_details_id
+ LEFT JOIN cnas_quality_monitor_details_ratify cqmder
+ ON cqmder.quality_monitor_details_id = cqmd.quality_monitor_details_id
+ order by cqmd.quality_monitor_details_id
) a
<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