优化

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;

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