fix: 80515 企标复审流程--自动发起未生效

laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java

@@ -488,6 +488,7 @@ public class ActFlowCommonService {
             String standardState = es.getStandardState();
             if (StandardStateEnum.ABOLISH.getStateValue().equals(standardState) ||
                     StandardStateEnum.ARCHIVE.getStateValue().equals(standardState)) {
+                log.error("企标编号为{}的企标已经废止或者封存，无法进行复审流程", es.getStandardNumber());
                 throw new JeroBootException(ResultCommon.CAN_NOT_EDIT_ABOLISH_OR_ARCHIVE_ES);
             }
         }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
+import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
@@ -55,8 +56,10 @@ public class ESRecheckPlanJob implements Job {
 
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        List<LawsEnterpriseStandard> allEs = esService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>().eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue()));
-
+        List<LawsEnterpriseStandard> allEs = esService.list(new LambdaQueryWrapper<LawsEnterpriseStandard>()
+                .eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue())
+                .ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue())
+                .ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ARCHIVE.getStateValue()));
         List<EnterpriseStandardRecheckPlan> recheckPlanList = esRecheckPlanService.list();
         Map<String, List<EnterpriseStandardRecheckPlan>> recheckPlanMap = recheckPlanList.stream().collect(Collectors.groupingBy(EnterpriseStandardRecheckPlan::getStandardId));
 
@@ -89,6 +92,7 @@ public class ESRecheckPlanJob implements Job {
                     esRecheckPlanService.save(recheckPlan);
                     // 自动发起流程
                     autoStartProcess(es, recheckPlan);
+                    log.info("企标编号为{}的企标已经达到35个月，已经自动发起复审流程", es.getStandardNumber());
                 } else {
                     // 如果已经有复审计划，则需要判断是否到达复审日期前一个月，如果到达则需要发起流程，已经发起过流程的不能重复发送
                     EnterpriseStandardRecheckPlan recheckPlan = recheckPlans.get(0);
@@ -97,10 +101,12 @@ public class ESRecheckPlanJob implements Job {
                     LocalDate minusMonths = recheckLocalDate.minusMonths(1);
                     if (recheckPlan.getInProcessFlag().equals(YesOrNoEnum.YES.getValue())) {
                         // 已经发起过流程，不需要重复发起
+                        log.info("企标编号为{}的企标已经达到复审日期前一个月，但是已经发起过复审流程，无需重复发起", es.getStandardNumber());
                         continue;
                     }
                     if (minusMonths.isBefore(recheckLocalDate)) {
                         autoStartProcess(es, recheckPlan);
+                        log.info("企标编号为{}的企标已经达到复审日期前一个月，已经自动发起复审流程", es.getStandardNumber());
                     }
                 }
             }