From 2f07589b54d56085af77b50d580890cd4130b444 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 19 十月 2026 15:19:53 +0800
Subject: [PATCH] 设备模块后端业务规则、计划接口与日期联动

---
 cnas-device/src/main/resources/mapper/DeviceCalibrationPlanDetailMapper.xml |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cnas-device/src/main/resources/mapper/DeviceCalibrationPlanDetailMapper.xml b/cnas-device/src/main/resources/mapper/DeviceCalibrationPlanDetailMapper.xml
index d6bce8c..9dc7a5a 100644
--- a/cnas-device/src/main/resources/mapper/DeviceCalibrationPlanDetailMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceCalibrationPlanDetailMapper.xml
@@ -3,11 +3,16 @@
 <mapper namespace="com.ruoyi.device.mapper.DeviceCalibrationPlanDetailMapper">
 
     <!-- 璁惧鏍″噯璁″垝璇︽儏鍒楄〃 -->
-    <select id="pageDeviceCalibrationPlanDetail" resultType="com.ruoyi.device.pojo.DeviceCalibrationPlanDetail">
+    <select id="pageDeviceCalibrationPlanDetail" resultType="com.ruoyi.device.dto.DeviceCalibrationPlanDetailDto">
         select * from (
-        select *
-        from device_calibration_plan_detail
-        order by plan_date asc
+        select t.*,
+        case when d.next_calibration_date is not null
+        and d.next_calibration_date &lt;= date_add(curdate(), interval 1 month)
+        and (d.last_calibration_date is null or d.last_calibration_date &lt; t.plan_date)
+        then 1 else 0 end as red_flag
+        from device_calibration_plan_detail t
+        left join device d on d.id = t.device_id
+        order by t.plan_date asc
         ) a
         <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
             ${ew.customSqlSegment}

--
Gitblit v1.9.3