1.巡检任务执行，点es的统计数据在检查提交后新全量写入

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -536,7 +536,7 @@ public class CheckServiceImpl implements ICheckService {
             StringBuffer deptName = new StringBuffer();
             if(planTask.getUserDept().indexOf(",") > 0) {
                 List<String> depts = Arrays.asList(planTask.getUserDept().split(","));
-                depts.stream().forEach(dept -> {
+                depts.forEach(dept -> {
                     deptName.append(dept.split("@")[2]).append(",");
                 });
 
@@ -618,15 +618,6 @@ public class CheckServiceImpl implements ICheckService {
                 taskDetail.setStatus(CheckStatusEnum.QUALIFIED.getCode());
             }
             planTaskDetailDao.saveAndFlush(taskDetail);
-            // 结果不合格时 更新统计不合格数量，小程序任务详情 环形图上方统计使用
-            if(check.getIsOk().equals(CheckStatusEnum.UNQUALIFIED.getCode())){
-                Optional<ESPlanTaskListDto>  op  = esPlanTaskList.findById(String.valueOf(planTask.getId()));
-                op.ifPresent(esPlanTaskListDto->{
-                    int unqualified = Integer.parseInt(esPlanTaskListDto.getUnqualified()) + 1;
-                    esPlanTaskListDto.setUnqualified( unqualified + "");
-                    esPlanTaskList.save(esPlanTaskListDto);
-                });
-            }
 //            ESTaskDetailDto esTaskDetailDto = esTaskDetail.findById(String.valueOf(taskDetail.getId())).get();
 //            esTaskDetailDto.setPointStatus(String.valueOf(taskDetail.getIsFinish()));
 //            JSONObject appCheckInput = esTaskDetailDto.getAppCheckInput();
@@ -714,10 +705,30 @@ public class CheckServiceImpl implements ICheckService {
             }
             if (check.getPlanTaskId() > 0) {
                 planTaskDetailMapper.finishTaskDetail(Long.parseLong(detail.get("planTaskDetailId").toString()), requestParam.getPointId(), requestParam.getPlanTaskId(), requestParam.getUserId());
+                // es 操作:更新检查点的状态（完成状态、检查状态）
+                Long planTaskId = planTask.getId();
+                Optional<ESPlanTaskListDto>  op  = esPlanTaskList.findById(String.valueOf(planTaskId));
+                if(check.getIsOk().equals(CheckStatusEnum.UNQUALIFIED.getCode())){
+                    // 结果不合格时 更新统计不合格数量，小程序任务详情 环形图上方统计使用
+                    op.ifPresent(esPlanTaskListDto->{
+                        String ids = String.format("(%d)",planTaskId);
+                        List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
+                        int unqualified = Integer.parseInt(esPlanTaskListDto.getUnqualified()) + 1;
+                        esPlanTaskListDto.setUnqualified( unqualified + "");
+                        esPlanTaskListDto.setPoints(maps);
+                        esPlanTaskList.save(esPlanTaskListDto);
+                    });
+                } else {
+                    // 结果合格时 更新点的状态
+                    op.ifPresent(esPlanTaskListDto->{
+                        String ids = String.format("(%d)",planTaskId);
+                        List<PlanTaskDetail> maps = planTaskMapper.selectTaskDetails(ids);
+                        esPlanTaskListDto.setPoints(maps);
+                        esPlanTaskList.save(esPlanTaskListDto);
+                    });
+                }
             }
-
-            CheckDto checkDto=    new CheckDto(check.getId(), unqualifiedcheckItemList);
-
+            CheckDto checkDto= new CheckDto(check.getId(), unqualifiedcheckItemList);
             return checkDto;
         } catch (Exception e) {
             e.printStackTrace();
@@ -2138,22 +2149,15 @@ public class CheckServiceImpl implements ICheckService {
     @Override
     public ESPlanTaskListDto buildEsTaskData(Long planTaskId,ESTaskDetailDto esTaskDetailDto) {
         ESPlanTaskListDto esPlanTaskListDto = esPlanTaskList.findById(String.valueOf(planTaskId)).get();
-        String finishNum = String.valueOf(Integer.valueOf(esPlanTaskListDto.getFinshNum()) + 1);
-        String unPlan = String.valueOf(Integer.valueOf(esPlanTaskListDto.getUnplan()) - 1);
+        String finishNum = String.valueOf(Integer.parseInt(esPlanTaskListDto.getFinshNum()) + 1);
+        String unPlan = String.valueOf(Integer.parseInt(esPlanTaskListDto.getUnplan()) - 1);
         esPlanTaskListDto.setFinshNum(finishNum);
         esPlanTaskListDto.setOmission(esPlanTaskListDto.getOmission());
         esPlanTaskListDto.setUnqualified(esPlanTaskListDto.getUnqualified());
         esPlanTaskListDto.setUnplan(unPlan);
         esPlanTaskListDto.setTaskPlanNum(esPlanTaskListDto.getTaskPlanNum());
-        List<PlanTaskDetail> points = esPlanTaskListDto.getPoints();
-        PlanTaskDetail planTaskDetail = points.stream().filter(x -> x.getId() == Long.valueOf(esTaskDetailDto.getId())).collect(Collectors.toList()).get(0);
-        points.remove(planTaskDetail);
-        planTaskDetail.setIsFinish(PlanTaskDetailIsFinishEnum.FINISHED.getValue());
-        planTaskDetail.setStatus(esTaskDetailDto.getIsRisk());
-        points.add(planTaskDetail);
         String status = unPlan.equals("0") ? String.valueOf(PlanTaskFinishStatusEnum.FINISHED.getValue()) : esPlanTaskListDto.getFinishStatus();
         esPlanTaskListDto.setFinishStatus(status);
-        esPlanTaskListDto.setPoints(points);
         return esPlanTaskListDto;
     }