From 8a362ef6953e990b4f940672c6abfc4b621bddee Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Fri, 10 Oct 2025 12:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/clz/MaterialMachineMapper.xml    | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
index 5e9c7694..74db825e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
@@ -1369,6 +1369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               AND sai.end_time IS NULL
               AND sai.back_id IS NULL
               AND bp.external_id IS NOT NULL
+              and sd.dept_id not in (342,345,347,348,101)
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
@@ -1437,6 +1438,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 sai.`status` = '0'
               AND sai.end_time IS NULL
               AND sai.back_id IS NULL
+              and sd.dept_id not in (342,345,347,348,101)
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name like concat('%',#{impUnitName},'%')
         </if>
@@ -1524,6 +1526,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND sai.back_id IS NULL
             AND bu.unit_name is not null
             AND bp.external_id is not NULL
+            and sd.dept_id not in (342,345,347,348,101)
             <if test="impUnitName != null and impUnitName != ''">
                 AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
             </if>
@@ -1601,6 +1604,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN  sys_dept sd ON sd.dept_id = bp.imp_unit
         WHERE
         sd.dept_name IS NOT NULL
+        and sd.dept_id not in (342,345,347,348,101)
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
         </if>
@@ -1617,6 +1621,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND bp.imp_unit = #{impUnit}
         </if>
         GROUP BY sd.dept_name
+        ORDER BY
+        sd.order_num
     </select>
 
     <select id="getDepartNameList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
@@ -1628,7 +1634,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sbd_audit.sg_project_department sp ON sd.company_code = sp.parent_id
         WHERE
         sp.`name` IS NOT NULL
-        AND sp.`status` IN (0, 1)
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
         </if>
@@ -1652,7 +1657,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getProjectList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
         SELECT
-        DISTINCT bp.pro_name AS proName,bp.pro_id AS proId
+        DISTINCT bp.pro_name AS proName,bp.pro_id AS proId,bp.external_id AS projectId
         FROM
         bm_project bp
         LEFT JOIN  sys_dept sd ON sd.dept_id = bp.imp_unit
@@ -1680,6 +1685,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         and bp.del_flag='0'
         GROUP BY bp.pro_name
+        ORDER BY sd.order_num,
+        CASE
+        WHEN df.voltage_level = '其他' THEN 999  -- 其他放在最后
+        WHEN df.voltage_level LIKE '%kV' THEN
+        CASE
+        WHEN df.voltage_level LIKE '±%' THEN
+        CAST(REPLACE(REPLACE(df.voltage_level, '±', ''), 'kV', '') AS DECIMAL) + 1000  -- 直流电压特殊处理
+        ELSE
+        CAST(REPLACE(df.voltage_level, 'kV', '') AS DECIMAL)
+        END
+        ELSE 998  -- 其他未知格式
+        END ASC
     </select>
 
     <select id="getTeamList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedEquipmentInfo">
@@ -1693,7 +1710,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id
         WHERE
         bz.bzmc IS NOT NULL
-        AND bp.external_id IS NOT NULL
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
         </if>
@@ -1729,7 +1745,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN data_center.dx_fb_son df ON bp.external_id = df.id
         WHERE
         bz.bzmc IS NOT NULL
-        AND bp.external_id IS NOT NULL
         <if test="impUnitName != null and impUnitName != ''">
             AND sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
         </if>