From 6c95c2f6a3602fe6f92898dd322c20bbe955e69d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 18:03:20 +0800
Subject: [PATCH] feat: 成品入库增加审批环节,原材质检后提交入库时增加一个审批环节

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

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..0943443 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.maintenance_location,
         dl.device_name,
         dl.device_model,
         su.nick_name as create_user_name
@@ -37,6 +38,9 @@
             </if>
             <if test="deviceMaintenanceDto.maintenanceActuallyName != null">
                 and dm.maintenance_actually_name like concat('%',#{deviceMaintenanceDto.maintenanceActuallyName},'%')
+            </if>
+            <if test="deviceMaintenanceDto.maintenanceLocation != null and deviceMaintenanceDto.maintenanceLocation != ''">
+                and dm.maintenance_location like concat('%',#{deviceMaintenanceDto.maintenanceLocation},'%')
             </if>
             <if test="deviceMaintenanceDto.maintenancePlanTime != null">
                 and dm.maintenance_plan_time like concat('%',#{deviceMaintenanceDto.maintenancePlanTime},'%')
@@ -63,6 +67,7 @@
                dm.update_user,
                dm.tenant_id,
                dm.maintenance_actually_name,
+               dm.maintenance_location,
                dl.device_name,
                dl.device_model,
                su.user_name as create_user_name

--
Gitblit v1.9.3