From a6a32bd01475c7263133aa3eef21667d2590acbf Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 16 五月 2026 15:12:31 +0800
Subject: [PATCH] feat(quality): 新增合格与不合格数量字段并调整质检逻辑
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index aeb87a8..713e346 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -5,16 +5,19 @@
<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,
@@ -51,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,
@@ -60,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,
--
Gitblit v1.9.3