From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   58 +++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 0cf426a..e21669f 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -7,33 +7,51 @@
 
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
         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,
-               dl.device_model,
-        su.user_name as create_user_name
+        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
         <where>
+            1 = 1
             <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>
+            <if test="deviceMaintenanceDto.status != null">
+                and dm.status = #{deviceMaintenanceDto.status}
+            </if>
+            <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
+                and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
+            </if>
+            <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
+            </if>
+            <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 id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
         select dm.id,
                dm.device_ledger_id,
                dm.maintenance_plan_time,
@@ -45,14 +63,20 @@
                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