From 4f55d3cb4bc644e4534106336f2047af1a4db5df Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 29 五月 2026 18:09:46 +0800
Subject: [PATCH] feat(config): 添加新环境配置并扩展设备台账功能
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index 8969d0c..65215dd 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -5,28 +5,33 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
- <select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
+ <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,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- dr.maintenance_price,
- dr.status,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.acceptance_name,
+ dr.acceptance_time,
+ dr.acceptance_remark,
+ dr.status,
dr.create_time,
dr.update_time,
dr.create_user,
dr.update_user,
- dr.tenant_id,
- dl.device_name,
- dl.device_model
+ 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>
@@ -49,18 +54,25 @@
<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.dto.DeviceRepairDto">
+ <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,
dr.maintenance_name,
dr.maintenance_time,
dr.maintenance_result,
- dr.maintenance_price,
+ dr.acceptance_name,
+ dr.acceptance_time,
+ dr.acceptance_remark,
dr.status,
dr.create_time,
dr.update_time,
@@ -68,9 +80,12 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
- dl.device_model
+ dr.machinery_category,
+ 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