定时任务超时创建漏检记录

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -227,5 +227,9 @@ public interface PlanTaskMapper extends BaseMapper {
 
 	List<Long> getPlanTaskListByPlanId(long planId, int finishStatus);
 
+	List<PlanTask> getPlanTaskTListByPlanId(long planId, int finishStatus);
+
 	void updatePlanTaskByPlanId(List<Long> ids, int finishStatus);
+
+	void updatePlanTaskDetailsByPlanId(List<Long> ids, int finishStatus);
 }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

@@ -602,16 +602,7 @@ public class JobService implements IJobService {
             } else if (XJConstant.STATUS_MONITOR_END.equals(jobType)) {
                 if (!ValidationUtil.isEmpty(StartPlanTaskList)) {
                     planTaskMapper.updatePlanTaskByPlanId(StartPlanTaskList,PlanTaskFinishStatusEnum.OVERTIME.getValue());
-                    for (Long id : StartPlanTaskList) {
-                        List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(id, PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
-                        if (!planTaskDetails.isEmpty()) {
-                            planTaskDetails.stream().forEach(action -> {
-                                action.setIsFinish(PlanTaskDetailIsFinishEnum.OVERTIME.getValue());
-                                action.setStatus(PlanTaskDetailStatusEnum.OMISSION.getValue());
-                                iPlanTaskDetailDao.saveAndFlush(action);
-                            });
-                        }
-                    }
+                    planTaskMapper.updatePlanTaskDetailsByPlanId(StartPlanTaskList,PlanTaskFinishStatusEnum.OVERTIME.getValue());
 
                     for (PlanTask planTask: planTaskList
                          ) {

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1584,13 +1584,26 @@
 
 	<update id="updatePlanTaskByPlanId">
 		update
-			"p_plan_task"
+		"p_plan_task"
+		set
+		finish_status = #{finishStatus}
+		where
+		id in
+		<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
+			#{id}
+		</foreach>
+	</update>
+	<update id="updatePlanTaskDetailsByPlanId">
+		update
+		"p_plan_task_detail"
 		set
-			finish_status = #{finishStatus}
+		is_finish = 2,
+		status = 3
 		where
-			id in
+		task_no in
 		<foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
 			#{id}
 		</foreach>
+		AND is_finish = 0
 	</update>
 </mapper>
\ No newline at end of file