小程序批量提交BUG修改

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

@@ -1124,23 +1124,24 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         Optional<PlanTask> planTaskOptional = iplanTaskDao.findById(Long.valueOf(id));
         PlanTask planTask = planTaskOptional.get();
 
-        planTask.setFinishStatus(XJConstant.TASK_STATUS_FINISH);
-        if(planTask.getRiskStatus() != 1) {
-            planTask.setRiskStatus(XJConstant.NORISK_NUM);
-        }
-        iplanTaskDao.saveAndFlush(planTask);
-        List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
-        if (!planTaskDetails.isEmpty()) {
-            planTaskDetails.stream().forEach(action -> {
-                action.setStatus(PlanTaskDetailStatusEnum.QUALIFIED.getValue());
-                iPlanTaskDetailDao.saveAndFlush(action);
-                planTaskDetailMapper.finishTaskDetail(action.getId(), action.getPointId(),
-                        action.getPlanTask().getId(), userId);
-            });
+        if(planTask.getFinishStatus() == XJConstant.TASK_STATUS_DEAL) {
+            planTask.setFinishStatus(XJConstant.TASK_STATUS_FINISH);
+            if(planTask.getRiskStatus() != 1) {
+                planTask.setRiskStatus(XJConstant.NORISK_NUM);
+            }
+            iplanTaskDao.saveAndFlush(planTask);
+            List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
+            if (!planTaskDetails.isEmpty()) {
+                planTaskDetails.stream().forEach(action -> {
+                    action.setStatus(PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+                    iPlanTaskDetailDao.saveAndFlush(action);
+                    planTaskDetailMapper.finishTaskDetail(action.getId(), action.getPointId(),
+                            action.getPlanTask().getId(), userId);
+                });
+            }
+            // 生成巡检记录
+            jobService.createCheckRecord(planTask, userId);
         }
-        // 生成巡检记录
-        jobService.createCheckRecord(planTask, userId);
-
     }