From 9582df9d37f5692e098802ef5d41774e9eb10e29 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 19 Oct 2023 09:48:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E6=AE=B5=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessEsAnnualInit.java | 61 ++++++++---- .../controller/ESAnnualReportController.java | 3 +- .../entity/ProcessEsAnnualReport.java | 99 +++++++++++-------- .../entity/ProcessEsInitChange.java | 21 ++-- 4 files changed, 120 insertions(+), 64 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java index 8408f6a8..d5df881c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -38,145 +38,160 @@ public class ProcessEsAnnualInit implements Serializable { /** * 企标计划Id */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "企标计划Id") private String espId; /** * 创建人 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "创建人") private String createBy; /** * 创建时间 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新人 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "更新人") private String updateBy; /** * 更新时间 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 所属部门 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "所属部门") private String orgCode; /** * 0表示未删除,1表示删除 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "0表示未删除,1表示删除") private Integer delFlag; /** * 流程实例Id */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "流程实例Id") private String processInstanceId; /** * 申请类别 */ - @ApiModelProperty(value = "主键ID") + @Dict(dicCode = "esp_application_category") + @ApiModelProperty(value = "申请类别") private String applicationCategory; /** - * 项目类型 + * 制修订类型 */ @Excel(name = "制修订类型", width = 15, orderNum = "1", dicCode = "esp_revision_type") @Dict(dicCode = "esp_revision_type") - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "制修订类型") private String projectType; /** * 原企标编号 */ @Excel(name = "原企标编号", width = 15, orderNum = "2") - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "原企标编号") private String originEnStandardNo; /** * 新企标编号 */ @Excel(name = "新企标编号", width = 15, orderNum = "3") + @ApiModelProperty(value = "新企标编号") private String newEnStandardNo; /** * 原企标名称 */ @Excel(name = "原企标名称", width = 15, orderNum = "4") + @ApiModelProperty(value = "原企标名称") private String originEnStandardName; /** * 新企标名称 */ @Excel(name = "新企标名称", width = 15, orderNum = "5") + @ApiModelProperty(value = "新企标名称") private String newEnStandardName; /** * 企标英文名称 */ + @ApiModelProperty(value = "企标英文名称") private String enStandardEnglishName; /** * 企标体系 */ + @Dict(dictTable = "laws_tree_node", dicCode = "id", dicText = "node_name") + @ApiModelProperty(value = "企标体系") private String enStandardSystem; /** * 企业标准代号 */ @Excel(name = "企业标准代号", width = 15, orderNum = "7") + @ApiModelProperty(value = "企业标准代号") private String enStandardCode; /** * 企业名称代号 */ + @ApiModelProperty(value = "企业名称代号") private String enNameCode; /** * 标准类别代号 */ + @ApiModelProperty(value = "标准类别代号") private String standardCategoryCode; /** * 年代号 */ + @ApiModelProperty(value = "年代号") private String decadeCode; /** * 标准类型 */ + @ApiModelProperty(value = "标准类型") private String standardType; /** * 企标等级分类 */ + @ApiModelProperty(value = "企标等级分类") private String enStandardClassification; /** * 草稿计划完成日期 */ - @Excel(name = "草稿计划完成日期", width = 15, orderNum = "13") + @Excel(name = "草稿计划完成日期", width = 20, orderNum = "13") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "草稿计划完成日期") private Date draftPlannedCompleteDate; /** * 征求意见稿计划完成日期 */ - @Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "14") + @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见稿计划完成日期") private Date solicitationDraftPlanCompleteDate; /** @@ -185,21 +200,25 @@ public class ProcessEsAnnualInit implements Serializable { @Excel(name = "计划报批日期", width = 15, orderNum = "15") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "计划报批日期") private Date planApprovalDate; /** * 项目状态 */ + @ApiModelProperty(value = "项目状态") private String projectStatus; /** * 编制说明 */ + @ApiModelProperty(value = "编制说明") private String compilationDescription; /** * 零部件名称 */ + @ApiModelProperty(value = "零部件名称") private String componentName; /** @@ -210,6 +229,10 @@ public class ProcessEsAnnualInit implements Serializable { @ApiModelProperty(value = "主起草人") 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") @ApiModelProperty(value = "主起草单位") 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") @Dict(dicCode = "id", dictTable = "sys_user", dicText = "username") + @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; @Excel(name = "标准推进人", width = 15, orderNum = "12") @@ -231,6 +255,7 @@ public class ProcessEsAnnualInit implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见稿完成日期") private Date solicitationDraftCompletionDate; /** @@ -238,7 +263,7 @@ public class ProcessEsAnnualInit implements Serializable { */ @Excel(name = "变更状态", width = 15, orderNum = "16", dicCode = "esp_change_status") @Dict(dicCode = "esp_change_status") - @ApiModelProperty(value = "授权部门") + @ApiModelProperty(value = "变更状态") private String changeStatus; /** @@ -251,7 +276,7 @@ public class ProcessEsAnnualInit implements Serializable { /** * 变更原因 */ - @ApiModelProperty(value = "授权部门") + @ApiModelProperty(value = "变更原因") private String changeReason; /** @@ -274,13 +299,13 @@ public class ProcessEsAnnualInit implements Serializable { * 联络人 */ @Excel(name = "联络人", width = 15, orderNum = "17") - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "联络人") private String contactUser; /** * 审批人 */ - @ApiModelProperty(value = "主键ID") + @ApiModelProperty(value = "审批人") private String approvalUser; @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java index 4bd669f2..4a72920c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java @@ -33,7 +33,8 @@ public class ESAnnualReportController { * 导入模板下载 */ @GetMapping("/templateDownload") - @ApiOperation(value = "企标年度制修订主动上报流程-导入模板下载", notes = "企标年度制修订主动上报流程-导入模板下载") + @ApiOperation(value = "企标年度制修订主动上报流程-导入模板下载", notes = "企标年度制修订主动上报流程-导入模板下载", + produces = "application/octet-stream") @AutoLog(value = "企标年度制修订主动上报流程-导入模板下载") public ModelAndView templateDownload() { // AutoPoi 导出Excel diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java index 46944522..30163db9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java @@ -39,46 +39,56 @@ public class ProcessEsAnnualReport implements Serializable { /** * 企标计划Id */ + @ApiModelProperty(value = "企标计划Id") private String espId; /** * 创建人 */ + @ApiModelProperty(value = "创建人") private String createBy; /** * 创建时间 */ + @ApiModelProperty(value = "创建时间") private Date createTime; /** * 更新人 */ + @ApiModelProperty(value = "更新人") private String updateBy; /** * 更新时间 */ + @ApiModelProperty(value = "更新时间") private Date updateTime; /** * 所属部门 */ + @ApiModelProperty(value = "所属部门") private String orgCode; /** * 0表示未删除,1表示删除 */ + @ApiModelProperty(value = "0表示未删除,1表示删除") private Integer delFlag; /** * 流程实例Id */ + @ApiModelProperty(value = "流程实例Id") private String processInstanceId; /** * 申请类别 */ + @Dict(dicCode = "esp_application_category") + @ApiModelProperty(value = "申请类别") private String applicationCategory; /** @@ -86,168 +96,167 @@ public class ProcessEsAnnualReport implements Serializable { */ @Excel(name = "制修订类型", width = 15, orderNum = "1") @Dict(dicCode = "esp_revision_type") + @ApiModelProperty(value = "制修订类型") private String projectType; /** * 原企标编号 */ @Excel(name = "原企标编号", width = 15, orderNum = "2") + @ApiModelProperty(value = "原企标编号") private String originEnStandardNo; /** * 新企标编号 */ @Excel(name = "新企标编号", width = 15, orderNum = "3") + @ApiModelProperty(value = "新企标编号") private String newEnStandardNo; /** * 原企标名称 */ @Excel(name = "原企标名称", width = 15, orderNum = "4") + @ApiModelProperty(value = "原企标名称") private String originEnStandardName; /** * 新企标名称 */ @Excel(name = "新企标名称", width = 15, orderNum = "5") + @ApiModelProperty(value = "新企标名称") private String newEnStandardName; /** * 企标英文名称 */ + @ApiModelProperty(value = "企标英文名称") private String enStandardEnglishName; /** * 企标体系 */ + @ApiModelProperty(value = "企标体系") 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; /** * 企业名称代号 */ + @ApiModelProperty(value = "企业名称代号") private String enNameCode; /** * 标准类别代号 */ + @ApiModelProperty(value = "标准类别代号") private String standardCategoryCode; /** * 年代号 */ + @ApiModelProperty(value = "年代号") private String decadeCode; /** * 标准类型 */ + @ApiModelProperty(value = "标准类型") private String standardType; /** * 企标等级分类 */ + @ApiModelProperty(value = "企标等级分类") private String enStandardClassification; /** * 草稿计划完成日期 */ - @Excel(name = "新企标名称", width = 15, orderNum = "13") + @Excel(name = "草稿计划完成日期", width = 20, orderNum = "13") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "草稿计划完成日期") private Date draftPlannedCompleteDate; /** * 征求意见稿计划完成日期 */ - @Excel(name = "新企标名称", width = 15, orderNum = "14") + @Excel(name = "征求意见稿计划完成日期", width = 24, orderNum = "14") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见稿计划完成日期") private Date solicitationDraftPlanCompleteDate; /** * 计划报批日期 */ - @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") + @ApiModelProperty(value = "计划报批日期") private Date planApprovalDate; /** * 项目状态 */ + @ApiModelProperty(value = "项目状态") private String projectStatus; /** * 编制说明 */ + @ApiModelProperty(value = "编制说明") private String compilationDescription; /** * 零部件名称 */ + @ApiModelProperty(value = "零部件名称") private String componentName; - /** * 主起草人 */ + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") + @ApiModelProperty(value = "主起草人") 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; - /** - * 主起草单位 - */ - @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; - /** - * 主起草单位责任人 - */ - @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; - /** - * 标准推进人 - */ - @Excel(name = "标准推进人", width = 15, orderNum = "12") - @TableField(exist = false) - @JsonProperty("standardPromoter_dictText") - private String standardPromoterDictText; - /** * 草稿完成日期 */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "草稿完成日期") private Date draftCompletionDate; /** @@ -255,11 +264,13 @@ public class ProcessEsAnnualReport implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "提交草稿日期") private Date draftSubmissionDate; /** * 是否征求意见 */ + @ApiModelProperty(value = "是否征求意见") private String solicitationOpinionEnabled; /** @@ -267,6 +278,7 @@ public class ProcessEsAnnualReport implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "征求意见稿完成日期") private Date solicitationDraftCompletionDate; /** @@ -274,34 +286,43 @@ public class ProcessEsAnnualReport implements Serializable { */ @Excel(name = "变更状态", width = 15, orderNum = "16") @Dict(dicCode = "esp_change_status") + @ApiModelProperty(value = "变更状态") private String changeStatus; /** * 上传附件 */ + @ApiModelProperty(value = "上传附件") private String uploadAttachment; /** * 变更原因 */ + @ApiModelProperty(value = "变更原因") 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; /** * 配合单位 */ - @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; /** * 隶属工作组 */ - @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; @TableField(exist = false) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index 0b620886..99a3ebf1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -57,9 +57,17 @@ public class ProcessEsInitChange implements Serializable { /** * 制修订类型1(合并流程字段) */ + @Dict(dicCode = "esp_project_type") @ApiModelProperty(value = "制修订类型1(合并流程字段)") private String projectTypeOne; + /** + * 制修订类型2(合并流程字段) + */ + @Dict(dicCode = "esp_project_type") + @ApiModelProperty(value = "制修订类型2(合并流程字段)") + private String projectTypeTwo; + /** * 标准计划Id2(合并流程字段) */ @@ -78,12 +86,6 @@ public class ProcessEsInitChange implements Serializable { @ApiModelProperty(value = "标准名称2(合并流程字段)") 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 = "创建时间") 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 = "更新时间") private Date updateTime; @@ -149,12 +155,14 @@ public class ProcessEsInitChange implements Serializable { /** * 申请类别 */ + @Dict(dicCode = "esp_application_category") @ApiModelProperty(value = "申请类别") private String applicationCategory; /** * 项目类型 */ + @Dict(dicCode = "esp_project_type") @ApiModelProperty(value = "项目类型") private String projectType; @@ -522,6 +530,7 @@ public class ProcessEsInitChange implements Serializable { /** * 配合单位 */ + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "配合单位") private String cooperationUnit;