维修拆分
This commit is contained in:
parent
d3e82bb53d
commit
1f13fd537b
|
|
@ -80,7 +80,7 @@ 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());
|
//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);
|
||||||
|
|
@ -88,7 +88,7 @@ public class RepairServiceImpl implements RepairService {
|
||||||
int repairedNumSum = tempList.stream().mapToInt(RepairDeviceVO::getRepairedNum).sum();
|
int repairedNumSum = tempList.stream().mapToInt(RepairDeviceVO::getRepairedNum).sum();
|
||||||
int scrapNumSum = tempList.stream().mapToInt(RepairDeviceVO::getScrapNum).sum();
|
int scrapNumSum = tempList.stream().mapToInt(RepairDeviceVO::getScrapNum).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(toRepairList);
|
vo.setRepairDeviceList(tempList);
|
||||||
vo.setIds(ids);
|
vo.setIds(ids);
|
||||||
vo.setTypeRepairNum(repairNumSum);
|
vo.setTypeRepairNum(repairNumSum);
|
||||||
vo.setTypeRepairedNum(repairedNumSum);
|
vo.setTypeRepairedNum(repairedNumSum);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue