From 089964a497c2528e88ddc610af5f88f631303431 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 18 五月 2026 15:28:16 +0800
Subject: [PATCH] feat: 设备保养新增任务状态,启动/停止与调度器关联

---
 src/main/resources/mapper/device/DeviceRepairMapper.xml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..5c73e4f 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -10,6 +10,9 @@
                dr.device_ledger_id,
                 dr.repair_time,
                 dr.repair_name,
+                dr.acceptance_name,
+                dr.acceptance_time,
+                dr.acceptance_remark,
                 dr.remark,
                 dr.maintenance_name,
                 dr.maintenance_time,
@@ -33,7 +36,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},'%')
@@ -55,6 +58,9 @@
                dr.device_ledger_id,
                dr.repair_time,
                dr.repair_name,
+               dr.acceptance_name,
+               dr.acceptance_time,
+               dr.acceptance_remark,
                dr.remark,
                dr.maintenance_name,
                dr.maintenance_time,

--
Gitblit v1.9.3