双规 一键提交添加事务

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

@@ -1306,6 +1306,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void handleAll(String id,String userId) {
         Optional<PlanTask> planTaskOptional = iplanTaskDao.findById(Long.valueOf(id));
         PlanTask planTask = planTaskOptional.get();
@@ -1319,6 +1320,23 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             // 生成巡检记录
             jobService.createCheckRecord(planTask, userId);
 
+            // 生成巡检记录
+            jobService.createCheckRecord(planTask, userId);
+            // 更新统计表
+            if(planTask.getPlanType().equals(String.valueOf(PlanTaskTypeStatusEnum.day.getValue()))) {
+                planTaskMapper.updateSingle(P_STATIC_DAY, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        planTask.getOrgCode(),planTask.getCheckDate());
+            } else if(planTask.getPlanType().equals(String.valueOf(PlanTaskTypeStatusEnum.week.getValue()))) {
+                planTaskMapper.updateSingle(P_STATIC_WEEK, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        planTask.getOrgCode(),planTask.getCheckDate());
+            } else {
+                planTaskMapper.updateSingle(P_STATIC_WEEK, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
+                        planTask.getOrgCode(),planTask.getCheckDate());
+            }
+
             List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
             if (!planTaskDetails.isEmpty()) {
                 Long routId = planTaskMapper.selectRoutId(id);
@@ -1347,23 +1365,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             esPlanTaskListDto.setPoints(planTaskDetails);
 
             esPlanTaskList.save(esPlanTaskListDto);
-
-            // 生成巡检记录
-            jobService.createCheckRecord(planTask, userId);
-            // 更新统计表
-            if(planTask.getPlanType().equals(String.valueOf(PlanTaskTypeStatusEnum.day.getValue()))) {
-                planTaskMapper.updateSingle(P_STATIC_DAY, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        planTask.getOrgCode(),planTask.getCheckDate());
-            } else if(planTask.getPlanType().equals(String.valueOf(PlanTaskTypeStatusEnum.week.getValue()))) {
-                planTaskMapper.updateSingle(P_STATIC_WEEK, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        planTask.getOrgCode(),planTask.getCheckDate());
-            } else {
-                planTaskMapper.updateSingle(P_STATIC_WEEK, XJConstant.RISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        XJConstant.NORISK_NUM == planTask.getRiskStatus() ? 1 : 0,
-                        planTask.getOrgCode(),planTask.getCheckDate());
-            }
         }
     }