From e48b2c58bf970508b307deb1f6d55a2cf6a60284 Mon Sep 17 00:00:00 2001
From: lizhenhua <1075222162@qq.com>
Date: Thu, 11 Dec 2025 17:54:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=AE=A1=E7=90=86=20youhua?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/domain/DeptEquipmentConfig.java |  1 +
 .../equipment/DeptEquipmentConfigMapper.xml   |  2 +
 .../material/equipment/SysDeptMapper.xml      | 40 ++++++++++++++++---
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptEquipmentConfig.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptEquipmentConfig.java
index 7b33211..f771663 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptEquipmentConfig.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/equipment/domain/DeptEquipmentConfig.java
@@ -17,6 +17,7 @@ public class DeptEquipmentConfig extends BaseEntity {
     private String equipmentId;
     private List<ConfigEntity> configs;
     private String configStatus;
+    private String jijuType;
 
     @Excel(name = "配置值")
     private String configValue;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml
index 9e39761..7b5a674 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/DeptEquipmentConfigMapper.xml
@@ -64,6 +64,7 @@
         config_value,
         config_rate,
         config_description,
+        jiju_type,
         remark
         )
         VALUES
@@ -75,6 +76,7 @@
             #{item.basicConfig},
             #{item.configurationRate},
             #{item.configurationDescription},
+            #{jijuType},
             #{remark}
             )
         </foreach>
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
index 9d8af43..4d3e4a6 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/equipment/SysDeptMapper.xml
@@ -99,16 +99,44 @@
         mt.type_id AS equipmentId,
         mt2.type_name AS equipmentName,
         mt.type_name AS equipmenttype,
+        mt.jiju_type  as jijuType,
         CASE
-        WHEN MAX(mdc.config_value) IS NOT NULL AND MAX(mdc.config_value) != '' THEN '已配置'
-        ELSE '未配置'
+
+        WHEN MAX( mdc.config_value ) IS NOT NULL
+        AND MAX( mdc.config_value ) != '' THEN
+        '已配置' ELSE '未配置'
         END AS configStatus
-        FROM ma_type mt
+        FROM
+        ma_type mt
         LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
-        LEFT JOIN ma_dept_config mdc
-        ON mdc.type_id = mt.type_id
+        LEFT JOIN ma_dept_config mdc ON mdc.type_id = mt.type_id
         AND mdc.dept_id = #{deptId}
-        WHERE mt.level = 3
+        WHERE
+        mt.LEVEL =5
+        GROUP BY
+        mt.type_id,
+        mt2.type_name,
+        mt.type_name
+        UNION
+
+        SELECT
+        mt.type_id AS equipmentId,
+        mt2.type_name AS equipmentName,
+        mt.type_name AS equipmenttype,
+        mt.jiju_type  as jijuType,
+        CASE
+
+        WHEN MAX( mdc.config_value ) IS NOT NULL
+        AND MAX( mdc.config_value ) != '' THEN
+        '已配置' ELSE '未配置'
+        END AS configStatus
+        FROM
+        tool_type mt
+        LEFT JOIN tool_type mt2 ON mt.parent_id = mt2.type_id
+        LEFT JOIN ma_dept_config mdc ON mdc.type_id = mt.type_id
+        AND mdc.dept_id = #{deptId}
+        WHERE
+        mt.LEVEL =4
         <if test="equipmentName != null and equipmentName != ''">
             AND mt.type_name LIKE CONCAT('%', #{equipmentName}, '%')
         </if>