diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java index 7bf35e3d..aa257376 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/entity/EsRevisionAdvice.java @@ -65,12 +65,6 @@ public class EsRevisionAdvice implements Serializable { @ApiModelProperty(value = "流程实例Id") private String processInstanceId; - /** - * 执行id - */ - @ApiModelProperty(value = "执行id") - private String executionId; - /** * 条款号 */ @@ -92,7 +86,7 @@ public class EsRevisionAdvice implements Serializable { /** * 意见提出人 */ - @Dict(dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')", dicCode = "id") + @Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") @ApiModelProperty(value = "意见提出人") private String createUserId; 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 c6e9ed08..9d2a561e 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 @@ -132,6 +132,7 @@ public class EsRevisionServiceImpl extends ServiceImpl processInfoVO) { + String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId(); ProcessRevisionVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); ProcessEsRevision processInfo = businessInfoDTO.getProcessInfo(); // 修改企标计划状态 @@ -144,6 +145,7 @@ public class EsRevisionServiceImpl extends ServiceImpl