diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java index 9650ccbe..65cd0c2d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/entity/ProcessEsRevision.java @@ -225,14 +225,12 @@ public class ProcessEsRevision implements Serializable { /** * 发布日期 */ - @TableField(exist = false) @ApiModelProperty(value = "发布日期") private String releaseDate; /** * 实施日期 */ - @TableField(exist = false) @ApiModelProperty(value = "实施日期") private String implementDate; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index 4f1b0ec7..edfca12c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.*; /** @@ -92,6 +93,8 @@ public class ProcessESRevisionEndListener implements ExecutionListener { } variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration()); + variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate()); + variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); String standardId = IdWorker.getIdStr(); variables.put(FieldCommon.ID, standardId);