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

修改

This commit is contained in:
hayu 2025-08-19 17:03:15 +08:00
parent d4cb1788c2
commit 51ec281b35
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java
View File

@ -72,4 +72,6 @@ public class RepairDeviceSummaryVo extends BaseVO {
@ApiModelProperty(value = "报废附件") @ApiModelProperty(value = "报废附件")
private List<BmFileInfo> fileList; private List<BmFileInfo> fileList;
private Integer dataStatusNum;
} }

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java
View File

@ -183,7 +183,6 @@ public class RepairServiceImpl implements RepairService {
Map<Long, List<RepairDeviceVO>> map = repairDeviceList.stream().collect(Collectors.groupingBy(RepairDeviceVO::getTypeId)); Map<Long, List<RepairDeviceVO>> map = repairDeviceList.stream().collect(Collectors.groupingBy(RepairDeviceVO::getTypeId));
for (Long key : map.keySet()) { for (Long key : map.keySet()) {
List<RepairDeviceVO> tempList = map.get(key); List<RepairDeviceVO> tempList = map.get(key);
// List<RepairDeviceVO> toRepairList = tempList.stream().filter(o -> !"1".equals(o.getStatus())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(tempList)) { if (CollectionUtil.isNotEmpty(tempList)) {
RepairDeviceSummaryVo vo = new RepairDeviceSummaryVo(); RepairDeviceSummaryVo vo = new RepairDeviceSummaryVo();
Long[] ids = tempList.stream().map(RepairDeviceVO::getId).toArray(Long[]::new); Long[] ids = tempList.stream().map(RepairDeviceVO::getId).toArray(Long[]::new);
@ -200,6 +199,12 @@ public class RepairServiceImpl implements RepairService {
.map(num -> Optional.ofNullable(num).orElse(BigDecimal.ZERO)) .map(num -> Optional.ofNullable(num).orElse(BigDecimal.ZERO))
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
Integer dataStatusSum = tempList.stream()
.map(RepairDeviceVO::getDataStatus)
.filter(Objects::nonNull)
.map(status -> "1".equals(status) ? 1 : 0) // 安全转换
.reduce(0, Integer::sum);
BigDecimal typeCostSum = tempList.stream().map(RepairDeviceVO::getTotalCost).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal typeCostSum = tempList.stream().map(RepairDeviceVO::getTotalCost).reduce(BigDecimal.ZERO, BigDecimal::add);
vo.setRepairDeviceList(tempList) vo.setRepairDeviceList(tempList)
.setIds(ids).setTypeRepairNum(repairNumSum).setTypeRepairedNum(repairedNumSum) .setIds(ids).setTypeRepairNum(repairNumSum).setTypeRepairedNum(repairedNumSum)
@ -207,6 +212,7 @@ public class RepairServiceImpl implements RepairService {
.setCode(tempList.get(0).getCode()).setTypeName(tempList.get(0).getTypeName()) .setCode(tempList.get(0).getCode()).setTypeName(tempList.get(0).getTypeName())
.setTypeId(tempList.get(0).getTypeId()).setType(tempList.get(0).getType()) .setTypeId(tempList.get(0).getTypeId()).setType(tempList.get(0).getType())
.setUnitName(tempList.get(0).getUnitName()).setManageType(tempList.get(0).getManageType()) .setUnitName(tempList.get(0).getUnitName()).setManageType(tempList.get(0).getManageType())
.setDataStatusNum(dataStatusSum)
.setTypeCost(typeCostSum); .setTypeCost(typeCostSum);
repairDeviceSummaryVoList.add(vo); repairDeviceSummaryVoList.add(vo);
} }