From 8e941a8eac3329725cdd59cfa2bf3482ccbf057a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 16:45:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 8969d0c..d82119b 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,13 +8,14 @@
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
- dr.repair_time,
dr.repair_name,
dr.remark,
+ dr.repair_project,
+ dr.repair_time_start as repairTimeStart,
+ dr.repair_time_end as repairTimeEnd,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
@@ -39,28 +40,31 @@
<if test="deviceRepairDto.remark != null">
and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
</if>
+ <if test="deviceRepairDto.repairProject != null">
+ and dr.repair_project like concat('%',#{deviceRepairDto.repairProject},'%')
+ </if>
<if test="deviceRepairDto.maintenanceName != null">
and dr.maintenance_name like concat('%',#{deviceRepairDto.maintenanceName},'%')
</if>
- <if test="deviceRepairDto.repairTimeStr != null and deviceRepairDto.repairTimeStr != '' ">
- and dr.repair_time like concat('%',#{deviceRepairDto.repairTimeStr},'%')
- </if>
+
<if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
</if>
</where>
+ order by dr.status asc, dr.create_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
select dr.id,
dr.device_ledger_id,
- dr.repair_time,
dr.repair_name,
dr.remark,
+ dr.repair_project,
+ dr.repair_time_start as repairTimeStart,
+ dr.repair_time_end as repairTimeEnd,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
dr.status,
dr.create_time,
dr.update_time,
--
Gitblit v1.9.3