From 9ad4c5c1d7077ca9210327f73d4d57f5f425475e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 25 四月 2026 11:24:46 +0800
Subject: [PATCH] refactor(production): 优化生产计划分页查询筛选条件+生产计划去掉审核状态字段

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

diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index ab11bd2..aeb87a8 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -21,7 +21,8 @@
                 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 +34,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},'%')
@@ -66,6 +67,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