From e2079ea034c7f6bb5fc096fd4d83ed9b2cc3ff13 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期日, 21 六月 2026 10:38:31 +0800
Subject: [PATCH] fix: 导入销售订单汇总修改
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 61a8781..21f60b8 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -20,6 +20,7 @@
dm.maintenance_actually_name,
dm.maintenance_person,
dm.maintenance_location,
+ dm.maintenance_items,
dl.device_name,
dl.device_model,
su.nick_name as create_user_name
@@ -43,6 +44,9 @@
<if test="deviceMaintenanceDto.maintenanceLocation != null and deviceMaintenanceDto.maintenanceLocation != ''">
and dm.maintenance_location like concat('%',#{deviceMaintenanceDto.maintenanceLocation},'%')
</if>
+ <if test="deviceMaintenanceDto.maintenanceItems != null and deviceMaintenanceDto.maintenanceItems != ''">
+ and dm.maintenance_items like concat('%',#{deviceMaintenanceDto.maintenanceItems},'%')
+ </if>
<if test="deviceMaintenanceDto.maintenancePlanTime != null">
and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
</if>
@@ -54,6 +58,7 @@
and dm.maintenance_actually_time < 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.id,
@@ -70,6 +75,7 @@
dm.maintenance_actually_name,
dm.maintenance_person,
dm.maintenance_location,
+ dm.maintenance_items,
dl.device_name,
dl.device_model,
su.user_name as create_user_name
--
Gitblit v1.9.3