| | |
| | | .list().stream().collect(Collectors.groupingBy(XpTestPlanVehicle::getTestPlanId)) : Collections.emptyMap(); |
| | | page.getRecords().forEach(plan -> { |
| | | if(pointMap.size() > 0){ |
| | | plan.setPointNum(pointMap.get(plan.getId()).size()); |
| | | plan.setPointNum(null == pointMap.get(plan.getId()) ? 0 : pointMap.get(plan.getId()).size()); |
| | | }else{ |
| | | plan.setPointNum(0); |
| | | } |
| | | if(vehicleMap.size() > 0){ |
| | | plan.setVehicleNum(vehicleMap.get(plan.getId()).size()); |
| | | plan.setVehicleNum(null == vehicleMap.get(plan.getId()) ? 0 : vehicleMap.get(plan.getId()).size()); |
| | | }else{ |
| | | plan.setVehicleNum(0); |
| | | } |
| | |
| | | vo.setEndTestPointName(point1.getPointName()); |
| | | vo.setEndTestPointAddress(point1.getPointAddress()); |
| | | } |
| | | vo.setStopFlag(planPoint.getStopFlag()); |
| | | return vo; |
| | | }).collect(Collectors.toList()); |
| | | |
| | |
| | | point.setTestPlanId(planId); |
| | | point.setStartTestPointId(pointDTO.getStartTestPointId()); |
| | | point.setEndTestPointId(pointDTO.getEndTestPointId()); |
| | | point.setStopFlag(pointDTO.getStopFlag()); |
| | | point.setTestOrderType(pointDTO.getTestOrderType()); |
| | | result.add(point); |
| | | } |
| | | return result; |