From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理：辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单：标签打印功能调整 3.人员：培训计划导入导出添加【培训大类】字段 4.业务管理：报检新增【物料属性】字段选择，其余页面添加【物料属性】查询条件以及数据回显
---
cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
index be608d7..0e8b619 100644
--- a/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
+++ b/cnas-process/src/main/resources/mapper/QualitySuperviseDetailsMapper.xml
@@ -6,16 +6,34 @@
<select id="pageQualitySuperviseDetail" resultType="com.ruoyi.process.dto.QualitySuperviseDetailsDto">
select *
from (select cd.*,
- cr.is_according,
- ca.is_correct,
- cc.supervise_details_correct_id
- from cnas_quality_supervise_details cd
- left join cnas_quality_supervise_details_record cr
- on cr.supervise_details_id = cd.supervise_details_id
- left join cnas_quality_supervise_details_according ca
- on ca.supervise_details_id = cd.supervise_details_id
- left join cnas_quality_supervise_details_correct cc
- on cc.supervise_details_id = cd.supervise_details_id
+ cr.is_according,
+ ca.is_correct,
+ cc.supervise_details_correct_id,
+ case
+ when cr.is_finish = 1 then 3
+ when cr.is_finish = 0 then 2
+ when cr.supervise_details_record_id is not null then 1
+ else 0
+ end record_status,
+ case
+ when ca.is_finish = 1 then 3
+ when ca.is_finish = 0 then 2
+ when ca.supervise_details_according_id is not null then 1
+ else 0
+ end according_status,
+ case
+ when cc.is_finish = 1 then 3
+ when cc.is_finish = 0 then 2
+ when cc.supervise_details_correct_id is not null then 1
+ else 0
+ end correct_status
+ from cnas_quality_supervise_details cd
+ left join cnas_quality_supervise_details_record cr
+ on cr.supervise_details_id = cd.supervise_details_id
+ left join cnas_quality_supervise_details_according ca
+ on ca.supervise_details_id = cd.supervise_details_id
+ left join cnas_quality_supervise_details_correct cc
+ on cc.supervise_details_id = cd.supervise_details_id
where 1=1
<choose>
<when test="causeType != null and causeType == 1">
--
Gitblit v1.9.3