diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 60b8204a..9a373aaf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -260,6 +260,13 @@ public class ProcessEsInitChange implements Serializable { */ private String mainDraftingUser; + /** + * 主起草人 + */ + @TableField(exist = false) + @JsonProperty("mainDraftingUser_dictText") + private String mainDraftingUserDictText; + /** * 主起草单位 */ @@ -277,6 +284,14 @@ public class ProcessEsInitChange implements Serializable { */ private String mainDraftingUnitResponsiblePerson; + /** + * 主起草单位责任人 + */ + @TableField(exist = false) + @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") + private String mainDraftingUnitResponsiblePersonDictText; + + /** * 新主起草单位负责人 */ @@ -287,6 +302,13 @@ public class ProcessEsInitChange implements Serializable { */ private String standardPromoter; + /** + * 标准推进人 + */ + @TableField(exist = false) + @JsonProperty("standardPromoter_dictText") + private String standardPromoterDictText; + /** * 草稿完成日期 */ @@ -433,13 +455,6 @@ public class ProcessEsInitChange implements Serializable { @JsonProperty("mainDraftingUserLeaderLeader_dictText") private String mainDraftUserLeaderLeaderDictText; - /** - * 主起草人 - */ - @TableField(exist = false) - @JsonProperty("mainDraftingUser_dictText") - private String mainDraftUserDictText; - /** * 标准化审批人 */ diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index ae760258..fca7d61b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -110,6 +110,9 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl