From 49ffaac190ee2b08b87b091d481db45d56f4551d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 9 Jan 2024 18:07:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080392=20=E4=BC=81=E6=A0=87=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=EF=BC=88=E4=B8=BB=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E4=BA=BA=E6=B1=87=E6=80=BB=EF=BC=89=20--=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=9F=BA=E6=9C=AC=E6=95=B0=E6=8D=AE--=E7=BC=BA?= =?UTF-8?q?=E5=B0=91=E7=BC=96=E5=88=B6=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esRevision/entity/ProcessEsRevision.java | 6 ++++++ .../esRevision/listener/ProcessESRevisionEndListener.java | 1 + .../com/jero/modules/laws/common/constant/FieldCommon.java | 2 ++ 3 files changed, 9 insertions(+) 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 679228a9..9650ccbe 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 @@ -283,6 +283,12 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "意见列表") private List advices; + /** + * 编制说明 + */ + @ApiModelProperty(value = "编制说明") + private String compIllustration; + public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) { this.otherDrafterUploadFileJson = otherDrafterUploadFileJson; } 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 dac85004..4f1b0ec7 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 @@ -91,6 +91,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener { } } variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); + variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); String standardId = IdWorker.getIdStr(); variables.put(FieldCommon.ID, standardId); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java index 50e01eee..e71e7db4 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java @@ -184,6 +184,8 @@ public class FieldCommon { public static final String ASSOCIATED_FILE = "associated_file"; // 标准状态 public static final String STANDARD_STATE = "standard_state"; + // 编制说明 + public static final String COMP_ILLUSTRATION = "comp_illustration"; // 标准等级分类 public static final String GRADE_CLASSIFICATION = "grade_classification"; // 标准英文名称