diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java index e39187b5..a606a350 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java @@ -31,6 +31,8 @@ import java.time.ZonedDateTime; import java.util.*; import java.util.stream.Collectors; +import static com.jero.modules.activiti.process.esRecheck.entity.ProcessRecheckConstants.*; + /** * @author: Mzaxd * @Date: 2023/11/8 9:11 @@ -130,7 +132,12 @@ public class ESRecheckPlanJob implements Job { Date recheckDate = recheckPlan.getRecheckDate(); LocalDate recheckLocalDate = recheckDate.toInstant().atZone(ZoneId.of("Asia/Shanghai")).toLocalDate(); LocalDate minusMonths = recheckLocalDate.minusMonths(1); - if (YesOrNoEnum.YES.getValue().equals(recheckPlan.getInProcessFlag())) { + String recheckResult = recheckPlan.getRecheckResult(); + // 流程中/修订/废止/封存 的不需要重新发起流程 + if (YesOrNoEnum.YES.getValue().equals(recheckPlan.getInProcessFlag()) || + recheckResult.equals(RECHECK_INIT_CHANGE) || + recheckResult.equals(RECHECK_ABOLISH) || + recheckResult.equals(RECHECK_ARCHIVE)) { // 已经发起过流程,不需要重复发起 log.info("企标编号为{}的企标已经达到复审日期前一个月,但是已经发起过复审流程,无需重复发起", es.getStandardNumber()); continue;