From 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 6b6929a..76f48f3 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.spare_parts_ids
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -32,12 +33,22 @@
<if test="deviceRepairDto.deviceModel != null">
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</if>
+ <if test="deviceRepairDto.status != null">
+ and dr.status = #{deviceRepairDto.status}
+ </if>
<if test="deviceRepairDto.remark != null">
and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
</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>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
--
Gitblit v1.9.3