Skip to content

A
amos-boot-biz
Commit fbdee10c authored by tianyiming's avatar tianyiming
Browse files
Options

1、app端计划列表不显示计划名称

2、计划详情点重复
parent 94681d43
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java
View file @ fbdee10c
...@@ -947,6 +947,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -947,6 +947,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
ESPlanTaskListDto.class); ESPlanTaskListDto.class);
esPlanTaskListDto.setPlanTaskId(String.valueOf(planTask.getId())); esPlanTaskListDto.setPlanTaskId(String.valueOf(planTask.getId()));
esPlanTaskListDto.setPlanId(String.valueOf(plan.getId())); esPlanTaskListDto.setPlanId(String.valueOf(plan.getId()));
esPlanTaskListDto.setTaskName(plan.getName());
esPlanTaskListDtos.add(esPlanTaskListDto); esPlanTaskListDtos.add(esPlanTaskListDto);
} }
em.flush(); em.flush();
...@@ -976,7 +977,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService { ...@@ -976,7 +977,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
} }
for (ESPlanTaskListDto esPlanTaskListDto : esPlanTaskListDtos) { for (ESPlanTaskListDto esPlanTaskListDto : esPlanTaskListDtos) {
esPlanTaskListDto.setPoints(planTaskDetailList); List<PlanTaskDetail> newPlanTaskDetailList = planTaskDetailList.stream().filter(x -> x.getTaskNo() == Long.valueOf(esPlanTaskListDto.getPlanTaskId())).collect(Collectors.toList());
esPlanTaskListDto.setPoints(newPlanTaskDetailList);
Map task = queryPlanTaskById(Long.valueOf(esPlanTaskListDto.getPlanTaskId())); Map task = queryPlanTaskById(Long.valueOf(esPlanTaskListDto.getPlanTaskId()));
esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(task.get("finshNum")) ? "0" : task.get("finshNum").toString()); esPlanTaskListDto.setFinshNum(ObjectUtils.isEmpty(task.get("finshNum")) ? "0" : task.get("finshNum").toString());
esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(task.get("omission")) ? "0" : task.get("omission").toString()); esPlanTaskListDto.setOmission(ObjectUtils.isEmpty(task.get("omission")) ? "0" : task.get("omission").toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment