diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java index b02467c3..b968f2c9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/ProcessEsRevision.java @@ -81,12 +81,6 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "是否开启征求意见 0不征求 1征求") private String adviceFlag; - /** - * 发布日期 - */ - @ApiModelProperty(value = "发布日期") - private String releaseDate; - /** * 征求意见截止日期 */ @@ -95,12 +89,6 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "征求意见截止日期") private Date adviceDeadline; - /** - * 主起草人 - */ - @ApiModelProperty(value = "主起草人") - private String mainDraftUser; - /** * 在线编辑文件id */ @@ -113,15 +101,24 @@ public class ProcessEsRevision implements Serializable { @ApiModelProperty(value = "业务JSON数据") private String businessJson; + /** + * 主起草人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "主起草人") + private String mainDraftUser; + /** * 法规工程师 */ + @TableField(exist = false) @ApiModelProperty(value = "法规工程师") private String standardEngineer; /** * 设计工程师 */ + @TableField(exist = false) @ApiModelProperty(value = "设计工程师") private String adviceUsers; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java index 8543b6bc..c6e9ed08 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java @@ -90,8 +90,6 @@ public class EsRevisionServiceImpl extends ServiceImpl processInfoVO) { - // 第一个节点业务数据处理 - this.startNodeBusProcess(processInfoVO); // 流程Key String processDefinitionKey = ProcessType.ES_REVISION_ADVICE.getProcessKey(); // 流程信息 @@ -114,6 +112,8 @@ public class EsRevisionServiceImpl extends ServiceImpl processInfoVO) { - // 保存数据 ProcessRevisionVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessEsRevision processInfo = businessInfoDTO.getProcessInfo(); - save(processInfo); // 修改企标计划状态 // 检查企标计划是否已被删除 String espId = processInfo.getEspId(); @@ -145,6 +143,8 @@ public class EsRevisionServiceImpl extends ServiceImpl setVariables(ProcessInfoVO processInfoVO) { diff --git a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java index bb90a094..7963f50a 100644 --- a/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/onlyoffice/service/impl/ProcessFileServiceImpl.java @@ -61,9 +61,6 @@ public class ProcessFileServiceImpl extends ServiceImpl