From 1c133d085d13dd728746fb621f2176e87476a80b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 18 Oct 2023 16:58:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/EnterpriseStandardPlan.java | 39 +++------ .../entity/vo/EnterpriseStandardPlanVo.java | 84 ++++++++----------- .../xml/EnterpriseStandardPlanMapper.xml | 64 +++----------- 3 files changed, 57 insertions(+), 130 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index 476b206e..a416c0c8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java @@ -1,12 +1,9 @@ package com.jero.modules.laws.enterprise.entity; -import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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; @@ -134,46 +131,32 @@ public class EnterpriseStandardPlan implements Serializable { @ApiModelProperty(value = "项目状态") private String projectStatus; + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") @ApiModelProperty(value = "编制说明") private String compilationDescription; - @TableField(exist = false) - @ApiModelProperty(value = "附件文件名") - private String compilationFileName; - @ApiModelProperty(value = "零部件名称") private String componentName; @ApiModelProperty(value = "授权部门") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") private String authDept; + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty(value = "主起草人") private String mainDraftingUser; - @TableField(exist = false) - @ApiModelProperty(value = "主起草人用户名") - @JsonProperty("mainDraftingUser_dictText") - private String mainDraftingUserDictText; - @ApiModelProperty(value = "主起草单位Id") - private String mainDraftingUnit; + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "主起草单位") - @TableField(exist = false) - @JsonProperty("mainDraftingUnit_dictText") - private String mainDraftingUnitDictText; + private String mainDraftingUnit; - @ApiModelProperty(value = "主起草单位责任人Id") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") + @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; - @TableField(exist = false) - @ApiModelProperty(value = "主起草单位责任人用户名") - @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") - private String mainDraftingUnitResponsiblePersonDictText; + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty(value = "标准推进人") private String standardPromoter; - @TableField(exist = false) - @ApiModelProperty(value = "标准推进人") - @JsonProperty("standardPromoter_dictText") - private String standardPromoterDictText; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @@ -231,17 +214,15 @@ public class EnterpriseStandardPlan implements Serializable { @ApiModelProperty(value = "备注") private String remarks; + @Dict(dictTable = "oss_file", dicCode = "id", dicText = "file_name") @ApiModelProperty(value = "上传附件") private String uploadAttachment; - @TableField(exist = false) - @ApiModelProperty(value = "附件文件名") - private String attachmentFileName; - @Dict(dicCode = "yn") @ApiModelProperty(value = "是否为优质标准") private String qualityFlag; + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "配合单位") private String cooperationUnit; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index e13e95bb..6037f5e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -46,77 +46,67 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "新企标名称") private String newEnStandardName; - @Excel(name = "授权部门", width = 15, orderNum = "1") + @Excel(name = "授权部门", width = 15, orderNum = "1", dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") @ApiModelProperty(value = "授权部门") - private String authDeparts; + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + private String authDept; + + @Excel(name = "配合单位", width = 15, orderNum = "1", 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 = "1") @ApiModelProperty(value = "企业标准代号") private String enStandardCode; - @Excel(name = "配合单位", width = 15, orderNum = "1") - @ApiModelProperty(value = "配合单位") - private String cooperateDeparts; - - @ApiModelProperty(value = "主起草人Id") + @Excel(name = "主起草人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") + @ApiModelProperty(value = "主起草人") private String mainDraftingUser; - @Excel(name = "主起草人", width = 15, orderNum = "1") - @ApiModelProperty(value = "主起草人用户名") - @JsonProperty("mainDraftingUser_dictText") - private String mainDraftingUserDictText; - - @ApiModelProperty(value = "主起草单位Id") + @Excel(name = "主起草单位", width = 15, orderNum = "1") + @Dict(dictTable = "sys_depart", dicCode = "id", dicText = "depart_name") + @ApiModelProperty(value = "主起草单位") private String mainDraftingUnit; - @Excel(name = "主起草单位", width = 15, orderNum = "1") - @ApiModelProperty(value = "主起草单位名") - @JsonProperty("mainDraftingUnit_dictText") - private String mainDraftingUnitDictText; - + @Excel(name = "主起草单位责任人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") @ApiModelProperty(value = "主起草单位责任人") private String mainDraftingUnitResponsiblePerson; - @Excel(name = "主起草单位责任人", width = 15, orderNum = "1") - @ApiModelProperty(value = "主起草单位责任人用户名") - @JsonProperty("mainDraftingUnitResponsiblePerson_dictText") - private String mainDraftingUnitResponsiblePersonDictText; - - @ApiModelProperty(value = "标准推进人Id") + @Excel(name = "标准推进人", width = 15, orderNum = "1", dictTable = "sys_user", dicCode = "id", dicText = "username") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username") + @ApiModelProperty(value = "标准推进人") private String standardPromoter; - @Excel(name = "标准推进人", width = 15, orderNum = "1") - @ApiModelProperty(value = "标准推进人用户名") - @JsonProperty("standardPromoter_dictText") - private String standardPromoterDictText; - @Excel(name = "草稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "草稿计划完成日期") private Date draftPlannedCompleteDate; @Excel(name = "征求意见稿计划完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "征求意见稿计划完成日期") private Date solicitationDraftPlanCompleteDate; @Excel(name = "计划报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "计划报批日期") private Date planApprovalDate; @Excel(name = "草稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "草稿完成日期") private Date draftCompletionDate; @Excel(name = "提交草稿日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "提交草稿日期") private Date draftSubmissionDate; @@ -126,26 +116,26 @@ public class EnterpriseStandardPlanVo { private String solicitationOpinionEnabled; @Excel(name = "征求意见稿完成日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "征求意见稿完成日期") private Date solicitationDraftCompletionDate; @Excel(name = "评审日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "评审日期") private Date reviewDate; @Excel(name = "报批日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "报批日期") private Date approvalDate; @Excel(name = "发布日期", width = 15, orderNum = "1", format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "发布日期") private Date releaseDate; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml index dc31f4b3..ac65f1c3 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/mapper/xml/EnterpriseStandardPlanMapper.xml @@ -87,17 +87,13 @@ p.origin_en_standard_name, p.new_en_standard_no, p.new_en_standard_name, - ad.authDeparts, + p.auth_dept, p.en_standard_code, - cu.cooperateDeparts, - u1.id AS mainDraftingUser, - u1.username AS mainDraftingUserDictText, - d.id AS mainDraftingUnit, - d.depart_name AS mainDraftingUnitDictText, - u2.id AS mainDraftingUnitResponsiblePerson, - u2.username AS mainDraftingUnitResponsiblePersonDictText, - u3.id AS standardPromoter, - u3.username AS standardPromoterDictText, + p.cooperation_unit, + p.main_drafting_user, + p.main_drafting_unit, + p.main_drafting_unit_responsible_person, + p.standard_promoter, p.draft_planned_complete_date, p.solicitation_draft_plan_complete_date, p.plan_approval_date, @@ -116,20 +112,6 @@ LEFT JOIN sys_user AS u2 ON u2.id = p.main_drafting_unit_responsible_person LEFT JOIN sys_user AS u3 ON u3.id = p.standard_promoter LEFT JOIN sys_depart AS d ON d.id = p.main_drafting_unit - LEFT JOIN - (SELECT - ad.plan_id as id, - GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS authDeparts - FROM - laws_enterprise_standard_plan_auth_dept AS ad - LEFT JOIN sys_depart AS d ON d.id = ad.dept_id) AS ad ON ad.id = p.id - LEFT JOIN - (SELECT - cu.plan_id as id, - GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS cooperateDeparts - FROM - laws_enterprise_standard_plan_cooperate_unit AS cu - LEFT JOIN sys_depart AS d ON d.id = cu.dept_id) AS cu ON cu.id = p.id WHERE p.del_flag = 0 @@ -230,16 +212,11 @@ p.plan_approval_date, p.project_status, p.compilation_description, - o1.file_name AS compilationFileName, p.component_name, - u1.id as mainDraftingUser, - u1.username as mainDraftingUserDictText, - d.id as mainDraftingUnit, - d.depart_name as mainDraftingUnitDictText, - u2.id as mainDraftingUnitResponsiblePerson, - u2.username as mainDraftingUnitResponsiblePersonDictText, - u3.id as promoter, - u3.username as standardPromoterDictText, + p.main_drafting_user, + p.main_drafting_unit, + p.main_drafting_unit_responsible_person, + p.standard_promoter, p.draft_completion_date, p.draft_submission_date, p.solicitation_opinion_enabled, @@ -255,30 +232,9 @@ p.project_expected_effects, p.remarks, p.upload_attachment, - o2.file_name AS attachmentFileName, p.quality_flag FROM `laws_enterprise_standard_plan` AS p - LEFT JOIN sys_user AS u1 ON u1.id = p.main_drafting_user - LEFT JOIN sys_user AS u2 ON u2.id = p.main_drafting_unit_responsible_person - LEFT JOIN sys_user AS u3 ON u3.id = p.standard_promoter - LEFT JOIN sys_depart AS d ON d.id = p.main_drafting_unit - LEFt JOIN oss_file AS o1 ON o1.id = p.compilation_description - LEFt JOIN oss_file AS o2 ON o2.id = p.upload_attachment - LEFT JOIN - (SELECT - ad.plan_id as id, - GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS authDeparts - FROM - laws_enterprise_standard_plan_auth_dept AS ad - LEFT JOIN sys_depart AS d ON d.id = ad.dept_id) AS ad ON ad.id = p.id - LEFT JOIN - (SELECT - cu.plan_id as id, - GROUP_CONCAT((d.depart_name) SEPARATOR '，') AS cooperateDeparts - FROM - laws_enterprise_standard_plan_cooperate_unit AS cu - LEFT JOIN sys_depart AS d ON d.id = cu.dept_id) AS cu ON cu.id = p.id WHERE p.id = #{id}