From 4b9dc71d162f3fcd79bc88b170154b7516fc4962 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 18 十二月 2025 13:37:14 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件
---
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..67bad7f 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -38,6 +38,16 @@
<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>
+ <if test="deviceRepairDto.status != null">
+ and dr.status = #{deviceRepairDto.status}
+ </if>
</where>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
@@ -56,7 +66,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