From 77b032fbf6f619afad9d7cbc9b7e8cd62703b63d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 2 Aug 2024 10:25:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=8D=E5=AE=A1=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E7=BB=93=E6=9E=9C=E4=B8=BA=E4=BF=AE=E8=AE=A2?=
 =?UTF-8?q?/=E5=BA=9F=E6=AD=A2/=E5=B0=81=E5=AD=98=E7=9A=84=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/enterprise/job/ESRecheckPlanJob.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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;