From 62f98b1445336c2f408e8cbfc132dfdc217965bf Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 19 Sep 2025 14:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MaterialMachineServiceImpl.java   | 14 +-------------
 .../mapper/material/clz/MaterialMachineMapper.xml  |  8 +++++++-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
index 3e7dc0d3..76aacb6d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
@@ -594,19 +594,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
         List<String> departId = mapper.getDepartId(username);
         // 根据项目部id查询工程信息
         List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean);
-
-        for (MaterialRetainedTeamTotalVo materialRetainedEquipmentInfo : teamNumList) {
-            // 根据班组名称查询分包单位
-            String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName());
-            materialRetainedEquipmentInfo.setSubUnitName(subUnitName);
-        }
-        if(bean.getSubUnitName()!=null && !bean.getSubUnitName().equals("") && !teamNumList.isEmpty()){
-            // 根据传入的SubUnitName过滤列表
-            teamNumList = teamNumList.stream()
-                    .filter(item -> StringUtils.equals(item.getSubUnitName(), bean.getSubUnitName()))
-                    .collect(Collectors.toList());
-        }
-        if (CollectionUtils.isEmpty(departId)) {
+        if (!CollectionUtils.isEmpty(departId)) {
             List<String> projectIdList = mapper.getProjectId(departId);
             List<BmProject> list = mapper.getProjectInfo(new BmProject());
             if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(projectIdList)) {
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 b7f98c5c..e0a0b2e3 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
@@ -839,13 +839,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SUM( sai.num ) as usNum,
         bu.bzz_idcard as idCard,
         bp.imp_unit as impUnit,
-        bp.pro_name as proName
+        bp.pro_name as proName,
+        bz.ssfbdw AS subUnitName
         FROM
         bm_unit bu
         LEFT JOIN clz_bm_agreement_info bai ON bu.unit_id = bai.unit_id
         LEFT JOIN clz_slt_agreement_info sai ON bai.agreement_id = sai.agreement_id
         LEFT JOIN bm_project bp ON bp.pro_id = bai.project_id
         LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit
+        LEFT JOIN `micro-tool`.bzgl_bz bz ON bp.external_id = bz.project_id
+        AND bz.bzmc = bu.unit_name
         WHERE
         sai.`status` = 0 and bu.type_id = 1731
         <if test="keyWord != null and keyWord != ''">
@@ -857,6 +860,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="impUnitName != null and impUnitName != ''">
             and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
         </if>
+        <if test="subUnitName != null and subUnitName != ''">
+            and bz.ssfbdw LIKE CONCAT('%', #{subUnitName}, '%')
+        </if>
         <if test="departName != null and departName != ''">
             and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
         </if>