From 4baaa911afb7ef80d11c5138194b915aa01841f2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 24 Jan 2024 13:44:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080515=20=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E6=B5=81=E7=A8=8B--=E8=87=AA=E5=8A=A8=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E6=9C=AA=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/common/service/ActFlowCommonService.java | 1 + .../modules/laws/enterprise/job/ESRecheckPlanJob.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 2996c481..7f9bdb93 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/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); } } 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 776a2bd4..e0b51741 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 @@ -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 allEs = esService.list(new LambdaQueryWrapper().eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue())); - + List allEs = esService.list(new LambdaQueryWrapper() + .eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue()) + .ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ABOLISH.getStateValue()) + .ne(LawsEnterpriseStandard::getStandardState, StandardStateEnum.ARCHIVE.getStateValue())); List recheckPlanList = esRecheckPlanService.list(); Map> 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()); } } }