From 9e9136a8440a9673b0218610692f370c641cfcf8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Sun, 25 Feb 2024 18:44:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2082018=20=E4=BC=81=E6=A0=87=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B--=E6=B5=81=E7=A8=8B=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=90=8E=EF=BC=8C=E6=A0=87=E5=87=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E7=BB=99=E7=9A=84=E9=BB=98=E8=AE=A4=E9=83=BD=E6=98=AF=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESChangeEndListener.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 602db1d9..9b3c90ee 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.CommonAPI; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.SysDictItemCore; @@ -423,17 +424,10 @@ public class ProcessESChangeEndListener implements ExecutionListener { boolean tryFlag = !change.getTryFlag().equals("0"); String trialPeriod = change.getTrialPeriod(); if (tryFlag) { - // 如果是试行 并且当前时间处于发布日期+试行周期期间内，则更改标准状态为试运行 - if (releaseDate != null && trialPeriod != null) { - Date endDate = new Date(releaseDate.getTime() + (long) Integer.parseInt(trialPeriod) * 24 * 60 * 60 * 1000 * 30); - Date now = new Date(); - if (now.before(endDate)) { - parameterMap.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); - } - } + parameterMap.put(FieldCommon.TRY_FLAG, change.getTryFlag()); + parameterMap.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); + parameterMap.put(FieldCommon.TRIAL_PERIOD,trialPeriod); } parameterMap.put(FieldCommon.RELEASE_DATE, formatter.format(releaseDate)); - parameterMap.put(FieldCommon.TRY_FLAG, change.getTryFlag()); - parameterMap.put(FieldCommon.TRIAL_PERIOD, change.getTrialPeriod()); } }