From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..de750a8 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -11,6 +11,7 @@
dr.repair_time,
dr.repair_name,
dr.remark,
+ dr.repair_project,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
@@ -33,10 +34,13 @@
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</if>
<if test="deviceRepairDto.status != null">
- and dl.status = #{deviceRepairDto.status}
+ and dr.status = #{deviceRepairDto.status}
</if>
<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},'%')
@@ -56,6 +60,7 @@
dr.repair_time,
dr.repair_name,
dr.remark,
+ dr.repair_project,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
--
Gitblit v1.9.3