From 5b73f899c41957496ee0e4257a8e8bd38fc51d37 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 24 九月 2026 14:50:10 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：待审批节点，第三人账号不可进行修改 2.营销管理-销售台账：勾选单个导出会出现整个导出的情况，但只能显示父项、不能显示子项 3.营销管理-销售台账：点击下拉没有价格，点击详情有价格

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   72 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 9072d29..cb05e72 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -6,19 +6,77 @@
 <mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
 
     <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
-        select dm.*,
-               dl.device_name,
-               dl.device_model
+        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
         <where>
-            <if test="deviceRepairDto.deviceName != null">
-                and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
+            <if test="deviceMaintenanceDto.deviceName != null">
+                and dl.device_name like concat('%',#{deviceMaintenanceDto.deviceName},'%')
             </if>
-            <if test="deviceRepairDto.deviceModel != null">
-                and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
+            <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>
+        order by dm.create_time desc
+    </select>
+    <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
+        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