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()); } }