diff --git a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java index 3e9b6a0..65eb5ab 100644 --- a/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java +++ b/cctp-atu/atu-execute-plan/src/main/java/net/northking/cctp/executePlan/job/PlanBatchTaskDataUpdateJob.java @@ -235,11 +235,7 @@ public class PlanBatchTaskDataUpdateJob { //获取更新后的批次信息 AtuPlanBatchDetailDto atuPlanBatchDetailDto = planBatchService.queryBatchDetailById(planBatch.getId()); - // 收尾处理 - AtuPlanInfo batchPlanInfo = planInfoService.findByBatchId(batchId); - if (batchPlanInfo != null) { - handleEnd(batchPlanInfo, atuPlanBatchDetailDto); - } + // 判断是否计划最后一批次 AtuPlanInfo planInfo = planInfoService.queryByLastBatchId(batchId); if (ObjectUtil.isNotNull(planInfo)) { @@ -264,6 +260,12 @@ public class PlanBatchTaskDataUpdateJob { // 2.2. 删除缓存中已完成批次的记录 logger.debug("删除批次统计缓存 => " + key); redisTemplate.delete(key); + + // 收尾处理 + AtuPlanInfo batchPlanInfo = planInfoService.findByBatchId(batchId); + if (batchPlanInfo != null) { + handleEnd(batchPlanInfo, atuPlanBatchDetailDto); + } }); logger.debug("同步缓存中计划批次统计数据----end----"); }