From 3d397976d08f0359b8cfeb4e4f22403ae5d0c04f Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期六, 24 十月 2026 20:44:14 +0800
Subject: [PATCH] feat(device): 设备核查计划附件与设备使用记录联动改造

---
 cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
index cd28058..edd6bbd 100644
--- a/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceExaminePlanDetailsMapper.xml
@@ -12,6 +12,7 @@
             d.device_id,
             d.device_number,
             d.device_name,
+            d.device_model,
             d.check_time,
             d.check_index,
             d.check_method,
@@ -19,6 +20,10 @@
             d.check_charger_user_id,
             CASE WHEN d.check_charger_user='' or d.check_charger_user is null THEN u.name
                 ELSE d.check_charger_user END AS check_charger_user,
+            d.environment,
+            d.check_basis,
+            d.appearance_status,
+            d.running_status,
             d.remark,
             d.file_name,
             d.file_url,
@@ -39,7 +44,8 @@
         CASE WHEN dev.next_examine_date IS NOT NULL
             AND dev.next_examine_date &lt;= date_add(curdate(), interval 1 month)
             AND (dev.last_examine_date IS NULL OR dev.last_examine_date &lt; str_to_date(concat(left(d.check_time, 7), '-01'), '%Y-%m-%d'))
-            THEN 1 ELSE 0 END red_flag
+            THEN 1 ELSE 0 END red_flag,
+        (select count(*) from device_examine_attachment a where a.plan_details_id = d.plan_details_id) attachment_count
         from device_examine_plan_details d
         left join user u on u.id = d.check_charger_user_id
         left join device_examine_record dc on d.plan_details_id = dc.plan_details_id

--
Gitblit v1.9.3