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/DeviceMaintenancePlanDetailsMapper.xml |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanDetailsMapper.xml
index 219a418..f772a03 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenancePlanDetailsMapper.xml
@@ -17,7 +17,7 @@
         where dmpd.maintenance_plan_id = #{maintenancePlanId}
     </select>
 
-    <!-- 璁惧淇濆吇璁″垝璇︽儏鍒楄〃锛堝惈鍒扮偣鏍囩孩锛� -->
+    <!-- 璁惧淇濆吇璁″垝璇︽儏鍒楄〃锛堝惈鍒扮偣鏍囩孩銆佸叧鑱旂殑淇濆吇璁板綍涓庡鏍哥姸鎬侊級 -->
     <select id="pageMaintenancePlanDetail" resultType="com.ruoyi.device.dto.DeviceMaintenancePlanDetailsDto">
         select
             dmpd.*,
@@ -26,12 +26,37 @@
             d.specification_model,
             d.management_number,
             d.storage_point,
+            d.maintenance_cycle,
+            dm.id record_id,
+            dm.maintenance_date record_maintenance_date,
+            dm.maintenance_user_id,
+            dm.maintenance_user_name,
+            dm.appearance_good,
+            dm.normal_use,
+            dm.surface_clean,
+            dm.label_intact,
+            dm.display_light_normal,
+            dm.no_rust,
+            dm.calibration_normal,
+            dm.parts_replace,
+            dm.result_normal,
+            dm.remark record_remark,
+            dm.review_status,
+            dm.review_user_id,
+            dm.review_user_name,
+            dm.review_remark,
+            dm.review_time,
+            case when dm.id is null then 0
+                 when dm.review_status = 1 then 2
+                 when dm.review_status = 0 then 3
+                 else 1 end as record_status,
             case when d.next_maintenance_date is not null
                 and d.next_maintenance_date &lt;= date_add(curdate(), interval 1 month)
                 and (d.last_maintenance_date is null or d.last_maintenance_date &lt; dmpd.maintenance_date)
                 then 1 else 0 end as red_flag
         from device_maintenance_plan_details dmpd
         left join device d on dmpd.device_id = d.id
+        left join device_maintenance dm on dm.maintenance_plan_detail_id = dmpd.maintenance_plan_detail_id
         where dmpd.maintenance_plan_id = #{planId}
         <if test="deviceName != null and deviceName != ''">
             and d.device_name like concat('%', #{deviceName}, '%')

--
Gitblit v1.9.3