ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 年段制修订流程字段翻译修正

Browse Source
This commit is contained in:
mzaxd
2023-10-20 11:05:49 +08:00
parent 56667ef63b
commit 9582df9d37
4 changed files with 120 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java
+43 -18
View File
@@ -38,145 +38,160 @@ public class ProcessEsAnnualInit implements Serializable {
/** /**
* 企标计划Id * 企标计划Id
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "企标计划Id")
private String espId; private String espId;
/** /**
* 创建人 * 创建人
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
/** /**
* 更新人 * 更新人
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "更新时间")
private Date updateTime; private Date updateTime;
/** /**
* 所属部门 * 所属部门
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "所属部门")
private String orgCode; private String orgCode;
/** /**
* 0表示未删除,1表示删除 * 0表示未删除,1表示删除
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "0表示未删除,1表示删除")
private Integer delFlag; private Integer delFlag;
/** /**
* 流程实例Id * 流程实例Id
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "流程实例Id")
private String processInstanceId; private String processInstanceId;
/** /**
* 申请类别 * 申请类别
*/ */
@ApiModelProperty(value = "主键ID") @Dict(dicCode = "esp_application_category")
@ApiModelProperty(value = "申请类别")
private String applicationCategory; private String applicationCategory;
/** /**
* 项目类型 * 制修订类型
*/ */
@Excel(name = "制修订类型", width = 15, orderNum = "1", dicCode = "esp_revision_type") @Excel(name = "制修订类型", width = 15, orderNum = "1", dicCode = "esp_revision_type")
@Dict(dicCode = "esp_revision_type") @Dict(dicCode = "esp_revision_type")
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "制修订类型")
private String projectType; private String projectType;
/** /**
* 原企标编号 * 原企标编号
*/ */
@Excel(name = "原企标编号", width = 15, orderNum = "2") @Excel(name = "原企标编号", width = 15, orderNum = "2")
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "原企标编号")
private String originEnStandardNo; private String originEnStandardNo;
/** /**
* 新企标编号 * 新企标编号
*/ */
@Excel(name = "新企标编号", width = 15, orderNum = "3") @Excel(name = "新企标编号", width = 15, orderNum = "3")
@ApiModelProperty(value = "新企标编号")
private String newEnStandardNo; private String newEnStandardNo;
/** /**
* 原企标名称 * 原企标名称
*/ */
@Excel(name = "原企标名称", width = 15, orderNum = "4") @Excel(name = "原企标名称", width = 15, orderNum = "4")
@ApiModelProperty(value = "原企标名称")
private String originEnStandardName; private String originEnStandardName;
/** /**
* 新企标名称 * 新企标名称
*/ */
@Excel(name = "新企标名称", width = 15, orderNum = "5") @Excel(name = "新企标名称", width = 15, orderNum = "5")
@ApiModelProperty(value = "新企标名称")
private String newEnStandardName; private String newEnStandardName;
/** /**
* 企标英文名称 * 企标英文名称
*/ */
@ApiModelProperty(value = "企标英文名称")
private String enStandardEnglishName; private String enStandardEnglishName;
/** /**
* 企标体系 * 企标体系
*/ */
@Dict(dictTable = "laws_tree_node", dicCode = "id", dicText = "node_name")
@ApiModelProperty(value = "企标体系")
private String enStandardSystem; private String enStandardSystem;
/** /**
* 企业标准代号 * 企业标准代号
*/ */
@Excel(name = "企业标准代号", width = 15, orderNum = "7") @Excel(name = "企业标准代号", width = 15, orderNum = "7")
@ApiModelProperty(value = "企业标准代号")
private String enStandardCode; private String enStandardCode;
/** /**
* 企业名称代号 * 企业名称代号
*/ */
@ApiModelProperty(value = "企业名称代号")
private String enNameCode; private String enNameCode;
/** /**
* 标准类别代号 * 标准类别代号
*/ */
@ApiModelProperty(value = "标准类别代号")
private String standardCategoryCode; private String standardCategoryCode;
/** /**
* 年代号 * 年代号
*/ */
@ApiModelProperty(value = "年代号")
private String decadeCode; private String decadeCode;
/** /**
* 标准类型 * 标准类型
*/ */
@ApiModelProperty(value = "标准类型")
private String standardType; private String standardType;
/** /**
* 企标等级分类 * 企标等级分类
*/ */
@ApiModelProperty(value = "企标等级分类")
private String enStandardClassification; private String enStandardClassification;
/** /**
* 草稿计划完成日期 * 草稿计划完成日期
*/ */
@Excel(name = "草稿计划完成日期", width = 15, orderNum = "13") @Excel(name = "草稿计划完成日期", width = 20, orderNum = "13")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "草稿计划完成日期")
private Date draftPlannedCompleteDate; private Date draftPlannedCompleteDate;
/** /**
* 征求意见稿计划完成日期 * 征求意见稿计划完成日期
*/ */
@Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "14") @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿计划完成日期")
private Date solicitationDraftPlanCompleteDate; private Date solicitationDraftPlanCompleteDate;
/** /**
@@ -185,21 +200,25 @@ 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") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "计划报批日期")
private Date planApprovalDate; private Date planApprovalDate;
/** /**
* 项目状态 * 项目状态
*/ */
@ApiModelProperty(value = "项目状态")
private String projectStatus; private String projectStatus;
/** /**
* 编制说明 * 编制说明
*/ */
@ApiModelProperty(value = "编制说明")
private String compilationDescription; private String compilationDescription;
/** /**
* 零部件名称 * 零部件名称
*/ */
@ApiModelProperty(value = "零部件名称")
private String componentName; private String componentName;
/** /**
@@ -210,6 +229,10 @@ public class ProcessEsAnnualInit implements Serializable {
@ApiModelProperty(value = "主起草人") @ApiModelProperty(value = "主起草人")
private String mainDraftingUser; private String mainDraftingUser;
/**
* 主起草单位
*/
@Excel(name = "主起草单位", width = 15, orderNum = "10", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主起草单位") @ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit; private String mainDraftingUnit;
@@ -219,6 +242,7 @@ public class ProcessEsAnnualInit implements Serializable {
*/ */
@Excel(name = "主起草单位责任人", width = 20, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "username") @Excel(name = "主起草单位责任人", width = 20, orderNum = "11", dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson; private String mainDraftingUnitResponsiblePerson;
@Excel(name = "标准推进人", width = 15, orderNum = "12") @Excel(name = "标准推进人", width = 15, orderNum = "12")
@@ -231,6 +255,7 @@ public class ProcessEsAnnualInit implements Serializable {
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿完成日期")
private Date solicitationDraftCompletionDate; private Date solicitationDraftCompletionDate;
/** /**
@@ -238,7 +263,7 @@ public class ProcessEsAnnualInit implements Serializable {
*/ */
@Excel(name = "变更状态", width = 15, orderNum = "16", dicCode = "esp_change_status") @Excel(name = "变更状态", width = 15, orderNum = "16", dicCode = "esp_change_status")
@Dict(dicCode = "esp_change_status") @Dict(dicCode = "esp_change_status")
@ApiModelProperty(value = "授权部门") @ApiModelProperty(value = "变更状态")
private String changeStatus; private String changeStatus;
/** /**
@@ -251,7 +276,7 @@ public class ProcessEsAnnualInit implements Serializable {
/** /**
* 变更原因 * 变更原因
*/ */
@ApiModelProperty(value = "授权部门") @ApiModelProperty(value = "变更原因")
private String changeReason; private String changeReason;
/** /**
@@ -274,13 +299,13 @@ public class ProcessEsAnnualInit implements Serializable {
* 联络人 * 联络人
*/ */
@Excel(name = "联络人", width = 15, orderNum = "17") @Excel(name = "联络人", width = 15, orderNum = "17")
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "联络人")
private String contactUser; private String contactUser;
/** /**
* 审批人 * 审批人
*/ */
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "审批人")
private String approvalUser; private String approvalUser;
@TableField(exist = false) @TableField(exist = false)
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java
+2 -1
View File
@@ -33,7 +33,8 @@ public class ESAnnualReportController {
* 导入模板下载 * 导入模板下载
*/ */
@GetMapping("/templateDownload") @GetMapping("/templateDownload")
@ApiOperation(value = "企标年度制修订主动上报流程-导入模板下载", notes = "企标年度制修订主动上报流程-导入模板下载") @ApiOperation(value = "企标年度制修订主动上报流程-导入模板下载", notes = "企标年度制修订主动上报流程-导入模板下载",
produces = "application/octet-stream")
@AutoLog(value = "企标年度制修订主动上报流程-导入模板下载") @AutoLog(value = "企标年度制修订主动上报流程-导入模板下载")
public ModelAndView templateDownload() { public ModelAndView templateDownload() {
// AutoPoi 导出Excel // AutoPoi 导出Excel
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+60 -39
View File
@@ -39,46 +39,56 @@ public class ProcessEsAnnualReport implements Serializable {
/** /**
* 企标计划Id * 企标计划Id
*/ */
@ApiModelProperty(value = "企标计划Id")
private String espId; private String espId;
/** /**
* 创建人 * 创建人
*/ */
@ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
/** /**
* 更新人 * 更新人
*/ */
@ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间")
private Date updateTime; private Date updateTime;
/** /**
* 所属部门 * 所属部门
*/ */
@ApiModelProperty(value = "所属部门")
private String orgCode; private String orgCode;
/** /**
* 0表示未删除,1表示删除 * 0表示未删除,1表示删除
*/ */
@ApiModelProperty(value = "0表示未删除,1表示删除")
private Integer delFlag; private Integer delFlag;
/** /**
* 流程实例Id * 流程实例Id
*/ */
@ApiModelProperty(value = "流程实例Id")
private String processInstanceId; private String processInstanceId;
/** /**
* 申请类别 * 申请类别
*/ */
@Dict(dicCode = "esp_application_category")
@ApiModelProperty(value = "申请类别")
private String applicationCategory; private String applicationCategory;
/** /**
@@ -86,168 +96,167 @@ public class ProcessEsAnnualReport implements Serializable {
*/ */
@Excel(name = "制修订类型", width = 15, orderNum = "1") @Excel(name = "制修订类型", width = 15, orderNum = "1")
@Dict(dicCode = "esp_revision_type") @Dict(dicCode = "esp_revision_type")
@ApiModelProperty(value = "制修订类型")
private String projectType; private String projectType;
/** /**
* 原企标编号 * 原企标编号
*/ */
@Excel(name = "原企标编号", width = 15, orderNum = "2") @Excel(name = "原企标编号", width = 15, orderNum = "2")
@ApiModelProperty(value = "原企标编号")
private String originEnStandardNo; private String originEnStandardNo;
/** /**
* 新企标编号 * 新企标编号
*/ */
@Excel(name = "新企标编号", width = 15, orderNum = "3") @Excel(name = "新企标编号", width = 15, orderNum = "3")
@ApiModelProperty(value = "新企标编号")
private String newEnStandardNo; private String newEnStandardNo;
/** /**
* 原企标名称 * 原企标名称
*/ */
@Excel(name = "原企标名称", width = 15, orderNum = "4") @Excel(name = "原企标名称", width = 15, orderNum = "4")
@ApiModelProperty(value = "原企标名称")
private String originEnStandardName; private String originEnStandardName;
/** /**
* 新企标名称 * 新企标名称
*/ */
@Excel(name = "新企标名称", width = 15, orderNum = "5") @Excel(name = "新企标名称", width = 15, orderNum = "5")
@ApiModelProperty(value = "新企标名称")
private String newEnStandardName; private String newEnStandardName;
/** /**
* 企标英文名称 * 企标英文名称
*/ */
@ApiModelProperty(value = "企标英文名称")
private String enStandardEnglishName; private String enStandardEnglishName;
/** /**
* 企标体系 * 企标体系
*/ */
@ApiModelProperty(value = "企标体系")
private String enStandardSystem; private String enStandardSystem;
/** /**
* 企业标准代号 * 企业标准代号
*/ */
@Excel(name = "企业标准代号", width = 15, orderNum = "7") @Excel(name = "企业标准代号", width = 15, orderNum = "7", dicCode = "enterprise_standard_code")
@Dict(dicCode = "enterprise_standard_code")
@ApiModelProperty(value = "企业标准代号")
private String enStandardCode; private String enStandardCode;
/** /**
* 企业名称代号 * 企业名称代号
*/ */
@ApiModelProperty(value = "企业名称代号")
private String enNameCode; private String enNameCode;
/** /**
* 标准类别代号 * 标准类别代号
*/ */
@ApiModelProperty(value = "标准类别代号")
private String standardCategoryCode; private String standardCategoryCode;
/** /**
* 年代号 * 年代号
*/ */
@ApiModelProperty(value = "年代号")
private String decadeCode; private String decadeCode;
/** /**
* 标准类型 * 标准类型
*/ */
@ApiModelProperty(value = "标准类型")
private String standardType; private String standardType;
/** /**
* 企标等级分类 * 企标等级分类
*/ */
@ApiModelProperty(value = "企标等级分类")
private String enStandardClassification; private String enStandardClassification;
/** /**
* 草稿计划完成日期 * 草稿计划完成日期
*/ */
@Excel(name = "新企标名称", width = 15, orderNum = "13") @Excel(name = "草稿计划完成日期", width = 20, orderNum = "13")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "草稿计划完成日期")
private Date draftPlannedCompleteDate; private Date draftPlannedCompleteDate;
/** /**
* 征求意见稿计划完成日期 * 征求意见稿计划完成日期
*/ */
@Excel(name = "新企标名称", width = 15, orderNum = "14") @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿计划完成日期")
private Date solicitationDraftPlanCompleteDate; private Date solicitationDraftPlanCompleteDate;
/** /**
* 计划报批日期 * 计划报批日期
*/ */
@Excel(name = "新企标名称", width = 15, orderNum = "15") @Excel(name = "计划报批日期", width = 15, orderNum = "15")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "计划报批日期")
private Date planApprovalDate; private Date planApprovalDate;
/** /**
* 项目状态 * 项目状态
*/ */
@ApiModelProperty(value = "项目状态")
private String projectStatus; private String projectStatus;
/** /**
* 编制说明 * 编制说明
*/ */
@ApiModelProperty(value = "编制说明")
private String compilationDescription; private String compilationDescription;
/** /**
* 零部件名称 * 零部件名称
*/ */
@ApiModelProperty(value = "零部件名称")
private String componentName; private String componentName;
/** /**
* 主起草人 * 主起草人
*/ */
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
@ApiModelProperty(value = "主起草人")
private String mainDraftingUser; private String mainDraftingUser;
/**
* 主起草人
*/
@TableField(exist = false)
@JsonProperty("mainDraftingUser_dictText")
private String mainDraftingUserDictText;
/** /**
* 主起草单位 * 主起草单位
*/ */
@Excel(name = "主起草单位", width = 15, orderNum = "9", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "主起草单位")
private String mainDraftingUnit; private String mainDraftingUnit;
/**
* 主起草单位
*/
@Excel(name = "主起草单位", width = 15, orderNum = "9")
@TableField(exist = false)
@JsonProperty("mainDraftingUnit_dictText")
private String mainDraftingUnitDictText;
/** /**
* 主起草单位责任人 * 主起草单位责任人
*/ */
@Excel(name = "主起草单位责任人", width = 20, orderNum = "10", dictTable = "sys_user", dicCode = "id", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@ApiModelProperty(value = "主起草单位责任人")
private String mainDraftingUnitResponsiblePerson; private String mainDraftingUnitResponsiblePerson;
/**
* 主起草单位责任人
*/
@Excel(name = "主起草单位责任人", width = 20, orderNum = "10")
@TableField(exist = false)
@JsonProperty("mainDraftingUnitResponsiblePerson_dictText")
private String mainDraftingUnitResponsiblePersonDictText;
/** /**
* 标准推进人 * 标准推进人
*/ */
@Excel(name = "标准推进人", width = 15, orderNum = "12", dicCode = "id", dictTable = "sys_user", dicText = "username")
@Dict(dicCode = "id", dictTable = "sys_user", dicText = "username")
@ApiModelProperty(value = "标准推进人")
private String standardPromoter; private String standardPromoter;
/**
* 标准推进人
*/
@Excel(name = "标准推进人", width = 15, orderNum = "12")
@TableField(exist = false)
@JsonProperty("standardPromoter_dictText")
private String standardPromoterDictText;
/** /**
* 草稿完成日期 * 草稿完成日期
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "草稿完成日期")
private Date draftCompletionDate; private Date draftCompletionDate;
/** /**
@@ -255,11 +264,13 @@ public class ProcessEsAnnualReport implements Serializable {
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "提交草稿日期")
private Date draftSubmissionDate; private Date draftSubmissionDate;
/** /**
* 是否征求意见 * 是否征求意见
*/ */
@ApiModelProperty(value = "是否征求意见")
private String solicitationOpinionEnabled; private String solicitationOpinionEnabled;
/** /**
@@ -267,6 +278,7 @@ public class ProcessEsAnnualReport implements Serializable {
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "征求意见稿完成日期")
private Date solicitationDraftCompletionDate; private Date solicitationDraftCompletionDate;
/** /**
@@ -274,34 +286,43 @@ public class ProcessEsAnnualReport implements Serializable {
*/ */
@Excel(name = "变更状态", width = 15, orderNum = "16") @Excel(name = "变更状态", width = 15, orderNum = "16")
@Dict(dicCode = "esp_change_status") @Dict(dicCode = "esp_change_status")
@ApiModelProperty(value = "变更状态")
private String changeStatus; private String changeStatus;
/** /**
* 上传附件 * 上传附件
*/ */
@ApiModelProperty(value = "上传附件")
private String uploadAttachment; private String uploadAttachment;
/** /**
* 变更原因 * 变更原因
*/ */
@ApiModelProperty(value = "变更原因")
private String changeReason; private String changeReason;
/** /**
* 授权部门 * 授权部门
*/ */
@Excel(name = "授权部门", width = 15, orderNum = "6") @Excel(name = "授权部门", width = 15, orderNum = "6", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "授权部门")
private String authDept; private String authDept;
/** /**
* 配合单位 * 配合单位
*/ */
@Excel(name = "配合单位", width = 15, orderNum = "8") @Excel(name = "配合单位", width = 15, orderNum = "8", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位")
private String cooperationUnit; private String cooperationUnit;
/** /**
* 隶属工作组 * 隶属工作组
*/ */
@Excel(name = "隶属工作组", width = 15, orderNum = "11") @Excel(name = "隶属工作组", width = 15, orderNum = "11", dictTable = "laws_working_group", dicCode = "id", dicText = "name")
@Dict(dictTable = "laws_working_group", dicCode = "id", dicText = "name")
@ApiModelProperty(value = "隶属工作组")
private String workGroup; private String workGroup;
@TableField(exist = false) @TableField(exist = false)
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java
+15 -6
View File
@@ -57,9 +57,17 @@ public class ProcessEsInitChange implements Serializable {
/** /**
* 制修订类型1（合并流程字段） * 制修订类型1（合并流程字段）
*/ */
@Dict(dicCode = "esp_project_type")
@ApiModelProperty(value = "制修订类型1（合并流程字段）") @ApiModelProperty(value = "制修订类型1（合并流程字段）")
private String projectTypeOne; private String projectTypeOne;
/**
* 制修订类型2（合并流程字段）
*/
@Dict(dicCode = "esp_project_type")
@ApiModelProperty(value = "制修订类型2（合并流程字段）")
private String projectTypeTwo;
/** /**
* 标准计划Id2（合并流程字段） * 标准计划Id2（合并流程字段）
*/ */
@@ -78,12 +86,6 @@ public class ProcessEsInitChange implements Serializable {
@ApiModelProperty(value = "标准名称2（合并流程字段）") @ApiModelProperty(value = "标准名称2（合并流程字段）")
private String standardNameTwo; private String standardNameTwo;
/**
* 制修订类型2（合并流程字段）
*/
@ApiModelProperty(value = "制修订类型2（合并流程字段）")
private String projectTypeTwo;
/** /**
* 创建人 * 创建人
*/ */
@@ -93,6 +95,8 @@ public class ProcessEsInitChange implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; private Date createTime;
@@ -105,6 +109,8 @@ public class ProcessEsInitChange implements Serializable {
/** /**
* 更新时间 * 更新时间
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private Date updateTime; private Date updateTime;
@@ -149,12 +155,14 @@ public class ProcessEsInitChange implements Serializable {
/** /**
* 申请类别 * 申请类别
*/ */
@Dict(dicCode = "esp_application_category")
@ApiModelProperty(value = "申请类别") @ApiModelProperty(value = "申请类别")
private String applicationCategory; private String applicationCategory;
/** /**
* 项目类型 * 项目类型
*/ */
@Dict(dicCode = "esp_project_type")
@ApiModelProperty(value = "项目类型") @ApiModelProperty(value = "项目类型")
private String projectType; private String projectType;
@@ -522,6 +530,7 @@ public class ProcessEsInitChange implements Serializable {
/** /**
* 配合单位 * 配合单位
*/ */
@Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name")
@ApiModelProperty(value = "配合单位") @ApiModelProperty(value = "配合单位")
private String cooperationUnit; private String cooperationUnit;