feat: 立项变更流程字段翻译修正

laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java

@@ -2,6 +2,7 @@ package com.jero.modules.activiti.process.common.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.CenterQueryVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.common.service.ProcessDraftService;
@@ -97,6 +98,7 @@ public class ProcessCenterController {
     @AutoLog(value = "流程中心-办理")
     @ApiOperation(value="流程中心-办理", notes="流程中心-办理")
     @GetMapping("/handle")
+    @Translation
     public Result<?> handle(@RequestParam("processInstanceId") String processInstanceId) {
         return Result.OK(actFlowCommonService.handleTask(processInstanceId));
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java

@@ -8,7 +8,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,59 +38,70 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 企标计划Id
      */
+    @ApiModelProperty(value = "主键ID")
     private String espId;
 
     /**
      * 创建人
      */
+    @ApiModelProperty(value = "主键ID")
     private String createBy;
 
     /**
      * 创建时间
      */
+    @ApiModelProperty(value = "主键ID")
     private Date createTime;
 
     /**
      * 更新人
      */
+    @ApiModelProperty(value = "主键ID")
     private String updateBy;
 
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "主键ID")
     private Date updateTime;
 
     /**
      * 所属部门
      */
+    @ApiModelProperty(value = "主键ID")
     private String orgCode;
 
     /**
      * 0表示未删除,1表示删除
      */
+    @ApiModelProperty(value = "主键ID")
     private Integer delFlag;
 
     /**
      * 流程实例Id
      */
+    @ApiModelProperty(value = "主键ID")
     private String processInstanceId;
 
     /**
      * 申请类别
      */
+    @ApiModelProperty(value = "主键ID")
     private String applicationCategory;
 
     /**
      * 项目类型
      */
-    @Excel(name = "制修订类型", width = 15, orderNum = "1")
+    @Excel(name = "制修订类型", width = 15, orderNum = "1", dicCode = "esp_revision_type")
     @Dict(dicCode = "esp_revision_type")
+    @ApiModelProperty(value = "主键ID")
     private String projectType;
 
     /**
      * 原企标编号
      */
     @Excel(name = "原企标编号", width = 15, orderNum = "2")
+    @ApiModelProperty(value = "主键ID")
     private String originEnStandardNo;
 
     /**
@@ -156,7 +166,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 草稿计划完成日期
      */
-    @Excel(name = "新企标名称", width = 15, orderNum = "13")
+    @Excel(name = "草稿计划完成日期", width = 15, orderNum = "13")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date draftPlannedCompleteDate;
@@ -164,7 +174,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 征求意见稿计划完成日期
      */
-    @Excel(name = "新企标名称", width = 15, orderNum = "14")
+    @Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "14")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date solicitationDraftPlanCompleteDate;
@@ -172,7 +182,7 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 计划报批日期
      */
-    @Excel(name = "新企标名称", width = 15, orderNum = "15")
+    @Excel(name = "计划报批日期", width = 15, orderNum = "15")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date planApprovalDate;
@@ -195,54 +205,26 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 主起草人
      */
+    @Excel(name = "主起草人", width = 15, orderNum = "9", dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @ApiModelProperty(value = "主起草人")
     private String mainDraftingUser;
 
-    /**
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
-     * 主起草人
+    @ApiModelProperty(value = "主起草单位")
-     */
-    @Excel(name = "主起草人", width = 15, orderNum = "9")
-    @TableField(exist = false)
-    @JsonProperty("mainDraftingUser_dictText")
-    private String mainDraftingUserDictText;
-
-    /**
-     * 主起草单位
-     */
     private String mainDraftingUnit;
 
-    /**
-     * 主起草单位
-     */
-    @Excel(name = "主起草单位", width = 15, orderNum = "10")
-    @TableField(exist = false)
-    @JsonProperty("mainDraftingUnit_dictText")
-    private String mainDraftingUnitDictText;
-
     /**
      * 主起草单位责任人
      */
+    @Excel(name = "主起草单位责任人", width = 20, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "username")
+    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
     private String mainDraftingUnitResponsiblePerson;
 
-    /**
-     * 主起草单位责任人
-     */
-    @Excel(name = "主起草单位责任人", width = 20, orderNum = "11")
-    @TableField(exist = false)
-    @JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
-    private String mainDraftingUnitResponsiblePersonDictText;
-
-    /**
-     * 标准推进人
-     */
-    private String standardPromoter;
-
-    /**
-     * 标准推进人
-     */
     @Excel(name = "标准推进人", width = 15, orderNum = "12")
-    @TableField(exist = false)
+    @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
-    @JsonProperty("standardPromoter_dictText")
+    @ApiModelProperty(value = "标准推进人")
-    private String standardPromoterDictText;
+    private String standardPromoter;
 
     /**
      * 征求意见稿完成日期
@@ -254,43 +236,56 @@ public class ProcessEsAnnualInit implements Serializable {
     /**
      * 变更状态
      */
-    @Excel(name = "变更状态", width = 15, orderNum = "16")
+    @Excel(name = "变更状态", width = 15, orderNum = "16", dicCode = "esp_change_status")
     @Dict(dicCode = "esp_change_status")
+    @ApiModelProperty(value = "授权部门")
     private String changeStatus;
 
     /**
      * 上传附件
      */
+    @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name")
+    @ApiModelProperty(value = "上传附件")
     private String uploadAttachment;
 
     /**
      * 变更原因
      */
+    @ApiModelProperty(value = "授权部门")
     private String changeReason;
 
     /**
      * 授权部门
      */
     @Excel(name = "授权部门", width = 15, orderNum = "6")
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    @ApiModelProperty(value = "授权部门")
     private String authDept;
 
     /**
      * 配合单位
      */
     @Excel(name = "配合单位", width = 15, orderNum = "8")
+    @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
+    @ApiModelProperty(value = "配合单位")
     private String cooperationUnit;
 
     /**
      * 联络人
      */
     @Excel(name = "联络人", width = 15, orderNum = "17")
+    @ApiModelProperty(value = "主键ID")
     private String contactUser;
 
     /**
      * 审批人
      */
+    @ApiModelProperty(value = "主键ID")
     private String approvalUser;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    private String sort;
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java

@@ -90,6 +90,7 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "企标英文名称")
     private String enStandardEnglishName;
 
+    @Dict(dictTable = "laws_tree_node", dicCode = "id", dicText = "node_name")
     @ApiModelProperty(value = "企标体系")
     private String enStandardSystem;