From 47291cc9294a0d31ab61acf13f82c36ba061cb91 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 25 三月 2026 14:48:26 +0800
Subject: [PATCH] feat(approve): 在审批记录中添加发货数量信息
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 6b6929a..d093980 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -32,12 +32,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