From c21cb3d8cebd9cdef4df2efa372c5b9257c713e4 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 28 十月 2026 17:57:40 +0800
Subject: [PATCH] feat(device,supply,satisfaction): 设备计划后端改造、耗材存放位置与满意度照片支持
---
cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index edd6bbd..0ecff02 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -3,8 +3,8 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceExaminePlanDetailsMapper">
- <!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
- <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
+ <!--璁惧鏍告煡璁″垝璇︽儏鍏叡鏌ヨ锛氬垪琛ㄤ笌瀵煎嚭鍏辩敤鍚屼竴濂楀瓧娈靛拰鎺掑簭-->
+ <sql id="deviceExaminePlanDetailQuery">
select * from (
select
d.plan_details_id,
@@ -36,6 +36,7 @@
WHEN dc.review_status = 1 THEN 2
WHEN dc.record_id IS NOT NULL THEN 1
ELSE 0 END record_status,
+ CASE WHEN dc.review_status = 1 THEN date_format(dc.update_time, '%Y-%m-%d') END complete_date,
CASE
WHEN dd.review_status = 0 THEN 3
WHEN dd.review_status = 1 THEN 2
@@ -56,6 +57,16 @@
${ew.customSqlSegment}
</if>
order by device_number asc, check_time desc
+ </sql>
+
+ <!--璁惧鏍告煡璁″垝璇︽儏鍒楄〃-->
+ <select id="pageDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
+ <include refid="deviceExaminePlanDetailQuery"/>
+ </select>
+
+ <!--璁惧鏍告煡璁″垝璇︽儏鍏ㄩ噺鍒楄〃锛堝鍑虹敤锛屼笉鍒嗛〉锛�-->
+ <select id="listDeviceExaminePlanDetail" resultType="com.ruoyi.device.dto.DeviceExaminePlanDetailsDto">
+ <include refid="deviceExaminePlanDetailQuery"/>
</select>
</mapper>
--
Gitblit v1.9.3