From 7e8edd4b59fb22146b90d01ca38f75148f3fd774 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 20 四月 2026 17:57:18 +0800
Subject: [PATCH] feat(bom): 添加BOM管理功能模块,工序 管理,基础 - 新增CustomerPrivatePoolMapper.xml实现客户私池映射 - 添加SysLoginController支持登录验证和用户信息获取 - 创建TechnologyBomController提供BOM的增删改查接口 - 定义TechnologyBomDto数据传输对象 - 实现TechnologyBomMapper和相关XML映射文件 - 开发TechnologyBomService业务逻辑层 - 添加TechnologyBomStructure结构管理功能 - 集成Excel导入导出BOM数据功能 - 实现BOM结构树形展示和维护功能

---
 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