From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   66 ++++++++++++++++++++++++++++-----
 1 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2529b0a..9c1b6d5 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -6,10 +6,22 @@
 <mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
 
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
-        select dm.*,
-               dl.device_name,
-               dl.device_model,
-        su.user_name as create_user_name
+        select dm.id,
+        dm.device_ledger_id,
+        dm.maintenance_plan_time,
+        dm.maintenance_actually_time,
+        dm.maintenance_result,
+        dm.status,
+        dm.create_time,
+        dm.update_time,
+        dm.create_user,
+        dm.update_user,
+        dm.tenant_id,
+        dm.maintenance_actually_name,
+        dl.device_name,
+        dm.machinery_category,
+        dl.device_model,
+        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 sys_user su on dm.create_user = su.user_id
@@ -17,20 +29,54 @@
             <if test="deviceMaintenanceDto.deviceName != null">
                 and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
             </if>
-            <if test="deviceMaintenanceDto.deviceModel != null">
-                and dl.device_model like concat('%',#{deviceMaintenanceDto.deviceModel},'%')
+            <if test="deviceMaintenanceDto.deviceModel != null and deviceMaintenanceDto.deviceModel != ''">
+                and dl.device_model like concat('%', #{deviceMaintenanceDto.deviceModel}, '%')
+            </if>
+            <if test="deviceMaintenanceDto.status != null">
+                and dm.status = #{deviceMaintenanceDto.status}
+            </if>
+            <if test="deviceMaintenanceDto.maintenanceActuallyName != null and deviceMaintenanceDto.maintenanceActuallyName != ''">
+                and dm.maintenance_actually_name like concat('%', #{deviceMaintenanceDto.maintenanceActuallyName}, '%')
+            </if>
+            <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+                and dm.maintenance_plan_time = #{deviceMaintenanceDto.maintenancePlanTime}
+            </if>
+            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+                and dm.maintenance_actually_time &gt;= 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>
+        order by dm.create_time desc
     </select>
-    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
-        select dm.*,
+
+    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
+        select dm.id,
+               dm.device_ledger_id,
+               dm.maintenance_plan_time,
+               dm.maintenance_actually_time,
+               dm.maintenance_result,
+               dm.status,
+               dm.create_time,
+               dm.update_time,
+               dm.create_user,
+               dm.update_user,
+               dm.tenant_id,
+               dm.machinery_category,
+               dm.maintenance_actually_name,
                dl.device_name,
                dl.device_model,
                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 sys_user su on dm.create_user = su.user_id
+                 left join device_ledger dl on dm.device_ledger_id = dl.id
+                 left join sys_user su on dm.create_user = su.user_id
         where dm.id = #{id}
     </select>
+    <select id="list1" resultType="com.ruoyi.device.pojo.DeviceMaintenance">
+        select *
+        from device_maintenance
+        where device_ledger_id = #{id}
+    </select>
 
 </mapper>

--
Gitblit v1.9.3