fix: 流程中人员翻译问题

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java

@@ -3,16 +3,14 @@ package com.jero.modules.activiti.process.esAnnualInit.controller;
 import com.jero.common.api.vo.Result;
 import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
-
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.process.common.entity.TransferVO;
-import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
 import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO;
 import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService;
-import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -155,7 +153,7 @@ public class ESAnnualInitController {
     @PostMapping("/importExcel")
     @ApiOperation(value = "企标年度制修订标准化发起流程-导入", notes = "企标年度制修订标准化发起流程-导入")
     @AutoLog(value = "企标年度制修订标准化发起流程-导入")
-    @Translation
+    @DictPoint
     public Result<?> importExcel(@ApiParam(value = "要上传的文件", required = true) @RequestParam("file") MultipartFile file) {
         Map<String, Object> resultMap = annualInitService.importData(file);
         Object flag = resultMap.get("flag");

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java

@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAnnualReport.controller;
 import com.jero.common.api.vo.Result;
 import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.aspect.annotation.DictPoint;
 import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.util.MessageUtils;
@@ -78,7 +79,7 @@ public class ESAnnualReportController {
     @PostMapping("/importExcel")
     @ApiOperation(value = "企标年度制修订主动上报流程-导入", notes = "企标年度制修订主动上报流程-导入")
     @AutoLog(value = "企标年度制修订主动上报流程-导入")
-    @Translation
+    @DictPoint
     public Result<?> importExcel(@ApiParam(value = "要上传的文件", required = true) @RequestParam("file") MultipartFile file) {
         Map<String, Object> resultMap = annualReportService.importData(file);
         Object flag = resultMap.get("flag");

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java

@@ -232,7 +232,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 主起草人
      */
     @Excel(name = "*主起草人", width = 15, orderNum = "8")
-    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
@@ -248,7 +248,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 主起草单位责任人
      */
     @Excel(name = "*起草单位责任人", width = 20, orderNum = "9")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "主起草单位责任人")
     private String mainDraftingUnitResponsiblePerson;
 
@@ -256,7 +256,7 @@ public class ProcessEsAnnualReport implements Serializable {
      * 标准推进人
      */
     @Excel(name = "*标准推进人", width = 15, orderNum = "11")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
@@ -337,35 +337,34 @@ public class ProcessEsAnnualReport implements Serializable {
     /**
      * 部门联络人
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "部门联络人")
     private String contactUser;
 
     /**
      * 工作组所联络人
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "工作组所联络人")
     private String workGroupUser;
 
     /**
      * 工作组所联络人集合
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
     @ApiModelProperty(value = "工作组所联络人集合")
     private String workGroupUserList;
 
     /**
      * 联络人主管级上一级领导
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "联络人主管级上一级领导")
     private String contactUserLeaderLeader;
 
     /**
      * 收集联络人主管级领导
      */
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "CONCAT(realname, '(', username, ')')")
     @ApiModelProperty(value = "收集联络人主管级领导")
     private String collectUserLeader;