From 377900a395f0238c98c5fbc945c2bea302b964f1 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 17 十二月 2025 17:28:39 +0800
Subject: [PATCH] 新增设备维修保养过程描述，上传对应附件
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 6b6929a..ca76180 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.maintenance_process_desc
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -37,6 +38,13 @@
</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>
@@ -56,7 +64,8 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dl.device_model,
+ dr.maintenance_process_desc
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
where dr.id = #{id}
--
Gitblit v1.9.3