From 62e7209401eb4732d9f5c64b81036c25b27710b3 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 17 七月 2025 14:36:53 +0800
Subject: [PATCH] yys 修改销售管理bug
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index cd78797..6b6929a 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -25,33 +25,40 @@
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
+ 1 = 1
<if test="deviceRepairDto.deviceName != null">
and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
</if>
<if test="deviceRepairDto.deviceModel != null">
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</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>
</where>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select select dr.id,
- dr.device_ledger_id,
- dr.repair_time,
- dr.repair_name,
- dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.status,
- dr.create_time,
- dr.update_time,
- dr.create_user,
- dr.update_user,
- dr.tenant_id,
+ select dr.id,
+ dr.device_ledger_id,
+ dr.repair_time,
+ dr.repair_name,
+ dr.remark,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.status,
+ dr.create_time,
+ dr.update_time,
+ dr.create_user,
+ dr.update_user,
+ dr.tenant_id,
dl.device_name,
dl.device_model
from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_ledger dl on dr.device_ledger_id = dl.id
where dr.id = #{id}
</select>
--
Gitblit v1.9.3