diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java index 7559c0a4..4496dcce 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceSummaryVo.java @@ -72,4 +72,6 @@ public class RepairDeviceSummaryVo extends BaseVO { @ApiModelProperty(value = "报废附件") private List fileList; + + private Integer dataStatusNum; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 2b5d38df..ac612d81 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -183,7 +183,6 @@ public class RepairServiceImpl implements RepairService { Map> map = repairDeviceList.stream().collect(Collectors.groupingBy(RepairDeviceVO::getTypeId)); for (Long key : map.keySet()) { List tempList = map.get(key); -// List toRepairList = tempList.stream().filter(o -> !"1".equals(o.getStatus())).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(tempList)) { RepairDeviceSummaryVo vo = new RepairDeviceSummaryVo(); 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)) .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); vo.setRepairDeviceList(tempList) .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()) .setTypeId(tempList.get(0).getTypeId()).setType(tempList.get(0).getType()) .setUnitName(tempList.get(0).getUnitName()).setManageType(tempList.get(0).getManageType()) + .setDataStatusNum(dataStatusSum) .setTypeCost(typeCostSum); repairDeviceSummaryVoList.add(vo); }