bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2025-09-19 14:29:06 +08:00
parent 9260cd9822 62f98b1445
commit 1466d8686e
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialMachineServiceImpl.java
View File

@ -594,19 +594,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
List<String> departId = mapper.getDepartId(username); List<String> departId = mapper.getDepartId(username);
// 根据项目部id查询工程信息 // 根据项目部id查询工程信息
List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean); List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean);
if (!CollectionUtils.isEmpty(departId)) {
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)) {
List<String> projectIdList = mapper.getProjectId(departId); List<String> projectIdList = mapper.getProjectId(departId);
List<BmProject> list = mapper.getProjectInfo(new BmProject()); List<BmProject> list = mapper.getProjectInfo(new BmProject());
if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(projectIdList)) { if (CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(projectIdList)) {

8
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -839,13 +839,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SUM( sai.num ) as usNum, SUM( sai.num ) as usNum,
bu.bzz_idcard as idCard, bu.bzz_idcard as idCard,
bp.imp_unit as impUnit, bp.imp_unit as impUnit,
bp.pro_name as proName bp.pro_name as proName,
bz.ssfbdw AS subUnitName
FROM FROM
bm_unit bu bm_unit bu
LEFT JOIN clz_bm_agreement_info bai ON bu.unit_id = bai.unit_id 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 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 bm_project bp ON bp.pro_id = bai.project_id
LEFT JOIN sys_dept sd ON sd.dept_id = bp.imp_unit 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 WHERE
sai.`status` = 0 and bu.type_id = 1731 sai.`status` = 0 and bu.type_id = 1731
<if test="keyWord != null and keyWord != ''"> <if test="keyWord != null and keyWord != ''">
@ -857,6 +860,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="impUnitName != null and impUnitName != ''"> <if test="impUnitName != null and impUnitName != ''">
and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%') and sd.dept_name LIKE CONCAT('%', #{impUnitName}, '%')
</if> </if>
<if test="subUnitName != null and subUnitName != ''">
and bz.ssfbdw LIKE CONCAT('%', #{subUnitName}, '%')
</if>
<if test="departName != null and departName != ''"> <if test="departName != null and departName != ''">
and bp.pro_center LIKE CONCAT('%', #{departName}, '%') and bp.pro_center LIKE CONCAT('%', #{departName}, '%')
</if> </if>