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

优化

This commit is contained in:
mashuai 2025-08-27 10:06:54 +08:00
parent 8d9b7ccfa3
commit dfaf94edd2
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialBackApplyInfoServiceImpl.java
View File

@ -92,6 +92,7 @@ public class MaterialBackApplyInfoServiceImpl implements MaterialBackApplyInfoSe
if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) { if (!org.springframework.util.CollectionUtils.isEmpty(projectIdList)) {
backApplyInfo.setProjectIdList(projectIdList); backApplyInfo.setProjectIdList(projectIdList);
} }
backApplyInfo.setIdCard(null);
} }
List<MaterialBackApplyInfo> list = materialBackInfoMapper.selectBackApplyInfoList(backApplyInfo); List<MaterialBackApplyInfo> list = materialBackInfoMapper.selectBackApplyInfoList(backApplyInfo);
// 如果列表为空，直接返回空列表 // 如果列表为空，直接返回空列表

1
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/service/impl/MaterialLeaseInfoServiceImpl.java
View File

@ -112,6 +112,7 @@ public class MaterialLeaseInfoServiceImpl implements MaterialLeaseInfoService {
if (!CollectionUtils.isEmpty(projectIdList)) { if (!CollectionUtils.isEmpty(projectIdList)) {
leaseApplyInfo.setProjectIdList(projectIdList); leaseApplyInfo.setProjectIdList(projectIdList);
} }
leaseApplyInfo.setIdCard(null);
} }
List<MaterialLeaseApplyInfo> list = materialLeaseInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo); List<MaterialLeaseApplyInfo> list = materialLeaseInfoMapper.selectLeaseApplyInfoList(leaseApplyInfo);
// 利用Stream API进行降序排序 // 利用Stream API进行降序排序

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

@ -327,6 +327,7 @@ public class MaterialMachineServiceImpl implements MaterialMachineService {
for (MaterialRetainedEquipmentInfo retainedEquipmentInfo : list) { for (MaterialRetainedEquipmentInfo retainedEquipmentInfo : list) {
MaterialRetainedEquipmentInfo info = new MaterialRetainedEquipmentInfo(); MaterialRetainedEquipmentInfo info = new MaterialRetainedEquipmentInfo();
info.setTypeId(retainedEquipmentInfo.getTypeId()); info.setTypeId(retainedEquipmentInfo.getTypeId());
info.setTeamId(bean.getTeamId());
List<MaterialRetainedEquipmentInfo> teamUseNumDetailsList = materialMachineMapper.getTeamUseNumDetailsList(info); List<MaterialRetainedEquipmentInfo> teamUseNumDetailsList = materialMachineMapper.getTeamUseNumDetailsList(info);
if (CollectionUtils.isNotEmpty(teamUseNumDetailsList)) { if (CollectionUtils.isNotEmpty(teamUseNumDetailsList)) {
retainedEquipmentInfo.setModelList(teamUseNumDetailsList); retainedEquipmentInfo.setModelList(teamUseNumDetailsList);