|
@@ -241,6 +241,7 @@ public class CustomPlanServiceImpl implements CustomPlanService {
|
|
|
List<PlanChild> list = planChildService.list(new QueryWrapper<PlanChild>().lambda().eq(PlanChild::getMainPlanId, copyPlanId)
|
|
|
.select(PlanChild::getPointNum, PlanChild::getTotal));
|
|
|
PlanChild planChild1 = list.get(0);
|
|
|
+ Long childid = planChild1.getId();
|
|
|
planChild.setPointNum(planChild1.getPointNum() == null ? 0 : planChild1.getPointNum());
|
|
|
planChild.setTotal(planChild1.getTotal() == null ? 0 : planChild1.getTotal());
|
|
|
planChildService.save(planChild);
|
|
@@ -248,12 +249,10 @@ public class CustomPlanServiceImpl implements CustomPlanService {
|
|
|
|
|
|
List<PlanPointTemp> pointTemps = planPointTempService
|
|
|
.list(new QueryWrapper<PlanPointTemp>().lambda()
|
|
|
- .eq(PlanPointTemp::getPlanId, copyPlanId)
|
|
|
+ .eq(PlanPointTemp::getChildPlanId,childid)
|
|
|
.eq(PlanPointTemp::getDeviceTypeId, deviceTypeId));
|
|
|
|
|
|
-
|
|
|
- Set<Long> collect = pointTemps.stream().map(PlanPointTemp::getChildPlanId).collect(Collectors.toSet());
|
|
|
- List<TfPlanPathTemp> planPathTemps = planPathTempService.list(new QueryWrapper<TfPlanPathTemp>().lambda().in(TfPlanPathTemp::getChildPlanId, collect));
|
|
|
+ List<TfPlanPathTemp> planPathTemps = planPathTempService.list(new QueryWrapper<TfPlanPathTemp>().lambda().eq(TfPlanPathTemp::getChildPlanId, childid));
|
|
|
|
|
|
|
|
|
Map<Long, List<TfPlanPathTemp>> longListMap = planPathTemps.stream().collect(Collectors.groupingBy(TfPlanPathTemp::getTempId));
|