From bd5d1dae54ea1e42e9e9f0d00f671d95914b105f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 01 六月 2026 16:54:56 +0800
Subject: [PATCH] Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_新疆马铃薯pro
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 713e346..65215dd 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -8,6 +8,7 @@
<select id="queryPage" resultType="com.ruoyi.device.vo.DeviceRepairVo">
select dr.id,
dr.device_ledger_id,
+ dr.area_id,
dr.repair_time,
dr.repair_name,
dr.remark,
@@ -22,14 +23,15 @@
dr.update_time,
dr.create_user,
dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model,
- dr.machinery_category
+ dr.tenant_id,
+ dl.device_name,
+ dl.device_model,
+ dr.machinery_category,
+ da.area_name
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_area da on dl.area_id = da.id
<where>
- 1 = 1
<if test="deviceRepairDto.deviceName != null">
and dl.device_name like concat('%',#{deviceRepairDto.deviceName},'%')
</if>
@@ -52,11 +54,16 @@
<if test="deviceRepairDto.maintenanceTimeStr != null and deviceRepairDto.maintenanceTimeStr != '' ">
and dr.maintenance_time like concat('%',#{deviceRepairDto.maintenanceTimeStr},'%')
</if>
+ <if test="deviceRepairDto.areaId != null">
+ and dr.area_id = #{deviceRepairDto.areaId}
+ </if>
</where>
+ order by dr.create_time desc
</select>
<select id="detailById" resultType="com.ruoyi.device.vo.DeviceRepairVo">
select dr.id,
dr.device_ledger_id,
+ dr.area_id,
dr.repair_time,
dr.repair_name,
dr.remark,
@@ -74,9 +81,11 @@
dr.tenant_id,
dl.device_name,
dr.machinery_category,
- dl.device_model
+ dl.device_model,
+ da.area_name
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_area da on dl.area_id = da.id
where dr.id = #{id}
</select>
--
Gitblit v1.9.3