From 0485bcb690d45b3995a813df3733af1693a4cc64 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Fri, 19 Sep 2025 14:32:03 +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

---
 .../material/clz/domain/vo/MaterialRetainedTeamTotalVo.java  | 3 +++
 .../resources/mapper/material/clz/MaterialMachineMapper.xml  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamTotalVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamTotalVo.java
index 41c72361..19e4450d 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamTotalVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedTeamTotalVo.java
@@ -50,6 +50,9 @@ public class MaterialRetainedTeamTotalVo {
     @Excel(name = "项目部")
     private String departName;
 
+    @ApiModelProperty(value = "工程id")
+    private String proId;
+
     @ApiModelProperty(value = "工程名称")
     @Excel(name = "工程名称")
     private String proName;
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 e0a0b2e3..7cbf0d1f 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,6 +839,7 @@ 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_id AS proId,
         bp.pro_name as proName,
         bz.ssfbdw AS subUnitName
         FROM
@@ -873,7 +874,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and bu.unit_name  LIKE CONCAT('%', #{teamName}, '%')
         </if>
         GROUP BY
-        bu.unit_id
+        bu.unit_id,
+        bp.pro_id
     </select>
 
     <select id="getTeamNumSecondList" resultType="com.bonus.material.clz.domain.vo.MaterialRetainedTeamVo">
@@ -901,6 +903,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             sai.status = '0'
           AND bt.unit_id = #{teamId}
+          AND bai.project_id = #{proId}
         <if test="keyWord != null and keyWord != ''">
             and (
             mt2.type_name like concat('%',#{keyWord},'%') or