From 4353aeda95c93aef98b93cd452990e775caee2e4 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Wed, 16 Jul 2025 11:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AB=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../clz/service/impl/BmTeamServiceImpl.java   |  6 +++++-
 .../impl/MaterialMachineServiceImpl.java      | 20 +++++++++++++------
 .../material/clz/MaterialMachineMapper.xml    |  9 +++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
index cb0f0f74..273e5c44 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/BmTeamServiceImpl.java
@@ -16,6 +16,7 @@ import com.bonus.material.clz.service.BmTeamService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -135,7 +136,10 @@ public class BmTeamServiceImpl implements BmTeamService {
         // 根据i8工程id查询班组信息
         List<String> ids = Collections.singletonList(tbTeam.getProjectId());
         iwsTeamUserVos = iwsTeamUserMapper.selectProjectTeamInfoByProjectIds(ids);
-        return AjaxResult.success(iwsTeamUserVos);
+        if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) {
+            return AjaxResult.success(iwsTeamUserVos);
+        }
+        return AjaxResult.success(new ArrayList<>());
     }
 
     /**
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 5e89a4d5..16398c08 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
@@ -177,6 +177,17 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
     @Override
     public List<MaterialRetainedEquipmentInfo> getRetainedEquipmentList(MaterialRetainedEquipmentInfo bean) {
         String username = SecurityUtils.getLoginUser().getUsername();
+        // 根据用户名判断用户是否为班组长
+        BmTeam teamData = materialMachineMapper.getTeamData(username);
+        if (teamData == null) {
+            // 根据用户名查询项目部信息
+            String departId = mapper.getDepartId(username);
+            // 根据项目部id查询工程信息
+            List<String> projectIdList = mapper.getProjectId(departId);
+            if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) {
+                bean.setProjectIdList(projectIdList);
+            }
+        }
         BigDecimal totalPrice = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
         BigDecimal totalStoreNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
         BigDecimal totalUsNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
@@ -184,14 +195,11 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
         BigDecimal totalInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
         BigDecimal totalRepairInputNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
         BigDecimal totalAllNum = BigDecimal.ZERO.setScale(3, RoundingMode.HALF_UP);
-        List<MaterialRetainedEquipmentInfo> recordList = materialMachineMapper.getRetainedEquipmentList(bean);
         Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId();
-        if (!CollectionUtils.isEmpty(recordList) && deptId != null) {
-            // 删除元素
-            recordList.removeIf(m -> !deptId.toString().equals(m.getImpUnit()));
+        if (deptId != null) {
+            bean.setImpUnit(deptId.toString());
         }
-        // 根据用户名判断用户是否为班组长
-        BmTeam teamData = materialMachineMapper.getTeamData(username);
+        List<MaterialRetainedEquipmentInfo> recordList = materialMachineMapper.getRetainedEquipmentList(bean);
         if (!org.springframework.util.CollectionUtils.isEmpty(recordList)) {
             if (teamData != null) {
                 // 将sortedList中班组身份证号与username相同的元素过滤处理
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 7fb4d4e0..06fa76e9 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
@@ -169,6 +169,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeModelName != null and typeModelName != ''">
             and mt.type_name like concat('%',#{typeModelName},'%')
         </if>
+        <if test="impUnit != null and impUnit != ''">
+            and subquery1.impUnit = #{impUnit}
+        </if>
+        <if test="projectIdList != null  and projectIdList.size() > 0">
+            and subquery1.externalId in
+            <foreach item="item" collection="projectIdList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
         mt.type_id,
         subquery1.proId