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}, '%') GROUP BY - bu.unit_id + bu.unit_id, + bp.pro_id