diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index c8661dd2..c59a2f20 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.esInitChange.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.Translation; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO; @@ -87,6 +88,7 @@ public class ProcessESInitChangeController { @AutoLog(value = "企标立项变更流程-办理") @ApiOperation(value="企标立项变更流程-办理", notes="企标立项变更流程-办理") @GetMapping("/handle/{taskId}") + @Translation public Result handle(@PathVariable("taskId") String taskId) { return Result.OK(initChangeService.getHandleData(taskId)); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java index 9216051c..eecbb635 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/vo/InitChangeFlowUserVO.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.esInitChange.entity.vo; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,46 +11,57 @@ import lombok.Data; @Data public class InitChangeFlowUserVO { + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("主起草人") private String mainDraftUser; // 部所联络人 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("部所联络人") private String contactUser; // 标准专家 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("标准专家") private String standardExpert; // 主起草人主管级领导 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("主起草人主管级领导") private String mainDraftUserLeader; // 主起草人主管级领导上级领导 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("主起草人主管级领导上级领导") private String mainDraftUserLeaderLeader; // 标准化审批人 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("标准化审批人") private String standardizationApprovalUser; // 新起草部门主管级领导上级领导 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("新起草部门主管级领导上级领导") private String newMainDraftUserLeaderLeader; // 新起草部门主管级领导 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("新起草部门主管级领导") private String newMainDraftUserLeader; // 相关人员 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("相关人员") private String relatedUser; // 抄送人 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("抄送人") private String copyUser; // 创建人 + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty("创建人") private String createUser; }