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

代码去除

This commit is contained in:
hongchao 2025-09-19 15:44:05 +08:00
parent 8000e6e4f8
commit 012d6be506
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,17 +617,17 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
} }
} }
List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean); List<MaterialRetainedTeamTotalVo> teamNumList = materialMachineMapper.getTeamNumList(bean);
for (MaterialRetainedTeamTotalVo materialRetainedEquipmentInfo : teamNumList) { // for (MaterialRetainedTeamTotalVo materialRetainedEquipmentInfo : teamNumList) {
// 根据班组名称查询分包单位 // // 根据班组名称查询分包单位
String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName()); // String subUnitName = iwsTeamUserMapper.getTeamName(materialRetainedEquipmentInfo.getTeamName());
materialRetainedEquipmentInfo.setSubUnitName(subUnitName); // materialRetainedEquipmentInfo.setSubUnitName(subUnitName);
} // }
if(bean.getSubUnitName()!=null && !bean.getSubUnitName().equals("") && !teamNumList.isEmpty()){ // if(bean.getSubUnitName()!=null && !bean.getSubUnitName().equals("") && !teamNumList.isEmpty()){
// 根据传入的SubUnitName过滤列表 // // 根据传入的SubUnitName过滤列表
teamNumList = teamNumList.stream() // teamNumList = teamNumList.stream()
.filter(item -> StringUtils.equals(item.getSubUnitName(), bean.getSubUnitName())) // .filter(item -> StringUtils.equals(item.getSubUnitName(), bean.getSubUnitName()))
.collect(Collectors.toList()); // .collect(Collectors.toList());
} // }
if (!hasSpecialRole) { if (!hasSpecialRole) {
if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) { if (CollectionUtil.isNotEmpty(iwsTeamUserVos)) {
if (CollectionUtil.isNotEmpty(teamNumList)) { if (CollectionUtil.isNotEmpty(teamNumList)) {
@ -649,6 +649,8 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
} }
return teamNumList; return teamNumList;
} }
// public List<MaterialRetainedTeamTotalVo> getTeamNumList(MaterialRetainedEquipmentInfo bean) { // public List<MaterialRetainedTeamTotalVo> getTeamNumList(MaterialRetainedEquipmentInfo bean) {
// String username = SecurityUtils.getLoginUser().getUsername(); // String username = SecurityUtils.getLoginUser().getUsername();
// // 根据用户名查询项目部信息 // // 根据用户名查询项目部信息