From c477506a6d672f71c6353608f3cf3424d8026790 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 四月 2026 18:18:40 +0800
Subject: [PATCH] refactor(approve): 优化审批流程ID生成逻辑

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9d5dd33..b9c67cb 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -8,6 +8,7 @@
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
         select dm.id,
         dm.device_ledger_id,
+        dm.area_id,
         dm.maintenance_plan_time,
         dm.maintenance_actually_time,
         dm.maintenance_result,
@@ -20,9 +21,11 @@
         dm.maintenance_actually_name,
         dl.device_name,
         dl.device_model,
+        da.area_name,
         su.nick_name as create_user_name
         from device_maintenance dm
         left join device_ledger dl on dm.device_ledger_id = dl.id
+        left join device_area da on dm.area_id = da.id
         left join sys_user su on dm.create_user = su.user_id
         <where>
             1 = 1
@@ -38,17 +41,22 @@
             <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
                 and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
             </if>
-            <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
-                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
+            <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
             </if>
-            <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
-                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
+            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTime},'%')
+            </if>
+            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+                and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
+                and dm.maintenance_actually_time &lt; date_add(str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d'), interval 1 day)
             </if>
         </where>
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
         select dm.id,
                dm.device_ledger_id,
+               dm.area_id,
                dm.maintenance_plan_time,
                dm.maintenance_actually_time,
                dm.maintenance_result,
@@ -61,9 +69,11 @@
                dm.maintenance_actually_name,
                dl.device_name,
                dl.device_model,
+               da.area_name,
                su.user_name as create_user_name
         from device_maintenance dm
                  left join device_ledger dl on dm.device_ledger_id = dl.id
+                 left join device_area da on dm.area_id = da.id
                  left join sys_user su on dm.create_user = su.user_id
         where dm.id = #{id}
     </select>

--
Gitblit v1.9.3