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-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index 36852a8..2de8c93 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -4,10 +4,22 @@
<!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
- <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.pojo.DeviceExaminePlanDetails">
+ <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
select * from (
- select *
- from device_examine_plan_details
+ select d.*,
+ CASE
+ WHEN dc.review_status = 0 THEN 3
+ WHEN dc.review_status = 1 THEN 2
+ WHEN dc.record_id IS NOT NULL THEN 1
+ ELSE 0 END record_status,
+ CASE
+ WHEN dd.review_status = 0 THEN 3
+ WHEN dd.review_status = 1 THEN 2
+ WHEN dd.record_contrast_id IS NOT NULL THEN 1
+ ELSE 0 END record_contrast_status
+ from device_examine_plan_details d
+ left join device_examine_record dc on d.plan_details_id = dc.plan_details_id
+ left join device_examine_record_contrast dd on dd.plan_details_id = dc.plan_details_id
order by check_time asc
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
--
Gitblit v1.9.3