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 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index e8565d6..67bad7f 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -45,6 +45,9 @@
             <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">
@@ -63,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