From 66fa277fa38f0bec6917eefe0ff5b384ad6d02e5 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 15 五月 2026 09:39:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..713e346 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -5,23 +5,27 @@
<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.repair_time,
dr.repair_name,
dr.remark,
- dr.maintenance_name,
- dr.maintenance_time,
- dr.maintenance_result,
- 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
+ dl.device_model,
+ dr.machinery_category
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
<where>
@@ -33,7 +37,7 @@
and dl.device_model like concat('%',#{deviceRepairDto.deviceModel},'%')
</if>
<if test="deviceRepairDto.status != null">
- and dl.status = #{deviceRepairDto.status}
+ and dr.status = #{deviceRepairDto.status}
</if>
<if test="deviceRepairDto.remark != null">
and dr.remark like concat('%',#{deviceRepairDto.remark},'%')
@@ -50,7 +54,7 @@
</if>
</where>
</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.repair_time,
@@ -59,6 +63,9 @@
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,
@@ -66,6 +73,7 @@
dr.update_user,
dr.tenant_id,
dl.device_name,
+ dr.machinery_category,
dl.device_model
from device_repair dr
left join device_ledger dl on dr.device_ledger_id = dl.id
--
Gitblit v1.9.3