From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 17 四月 2025 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
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