From 11bd127f2e80f8c2eb8d1b4e618e59dcf9d95834 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 14 三月 2026 14:28:15 +0800
Subject: [PATCH] feat: 新增产品参数配置模块及CRUD接口

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 7046102..a8cdf98 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -18,6 +18,7 @@
         dm.update_user,
         dm.tenant_id,
         dm.maintenance_actually_name,
+        dm.remark,
         dl.device_name,
         dl.device_model,
         su.nick_name as create_user_name
@@ -38,11 +39,11 @@
             <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
                 and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
             </if>
-            <if test="deviceMaintenanceDto.maintenancePlanTimeReq != null">
-                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTimeReq},'%')
+            <if test="deviceMaintenanceDto.maintenancePlanTime != null">
+                and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
             </if>
-            <if test="deviceMaintenanceDto.maintenanceActuallyTimeReq != null">
-                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTimeReq},'%')
+            <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
+                and dm.maintenance_actually_time like concat('%',#{deviceMaintenanceDto.maintenanceActuallyTime},'%')
             </if>
             <if test="deviceMaintenanceDto.maintenanceActuallyTime != null">
                 and dm.maintenance_actually_time >= str_to_date(#{deviceMaintenanceDto.maintenanceActuallyTime}, '%Y-%m-%d')
@@ -63,6 +64,7 @@
                dm.update_user,
                dm.tenant_id,
                dm.maintenance_actually_name,
+               dm.remark,
                dl.device_name,
                dl.device_model,
                su.user_name as create_user_name

--
Gitblit v1.9.3