From 0beb4e197c13ccce94a943e158993c503700f4da Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 20 八月 2026 17:57:23 +0800
Subject: [PATCH] feat(sales): 实现发货模块部分发货与批量发货功能

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 7046102..e630b9f 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -20,7 +20,8 @@
         dm.maintenance_actually_name,
         dl.device_name,
         dl.device_model,
-        su.nick_name as create_user_name
+        su.nick_name as create_user_name,
+        dm.maintenance_item
         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
@@ -38,17 +39,18 @@
             <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>
+        order by maintenance_plan_time desc
     </select>
     <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
         select dm.id,
@@ -63,6 +65,7 @@
                dm.update_user,
                dm.tenant_id,
                dm.maintenance_actually_name,
+               dm.maintenance_item,
                dl.device_name,
                dl.device_model,
                su.user_name as create_user_name

--
Gitblit v1.9.3