From 05eb857b884e49fe80c8e3bbd7c90d34fcb32c4d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 15 Sep 2023 10:03:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92-?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseStandardPlanController.java     |  2 +-
 .../entity/EnterpriseStandardPlan.java        | 41 +++++++++++++++++-
 .../xml/EnterpriseStandardPlanMapper.xml      | 42 +++++++++++++++----
 3 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java
index 8a3235ef..e8b0d39d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/controller/EnterpriseStandardPlanController.java
@@ -55,7 +55,7 @@ public class EnterpriseStandardPlanController extends JeroController<EnterpriseS
 	@AutoLog(value = "企标计划-企标详情")
 	@ApiOperation(value="企标计划-企标详情", notes="企标计划-企标详情")
 	@GetMapping(value = "/detail")
-	public Result<?> queryPageList(@RequestParam("id") String planId) {
+	public Result<?> getDetailById(@RequestParam("id") String planId) {
 		EnterpriseStandardPlan detail = esPlanService.getDetailById(planId);
 		return Result.OK(detail);
 	}
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 062a900f..10b5e75f 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,9 +1,11 @@
 package com.jero.modules.laws.enterprise.entity;
 
 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.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,8 +38,8 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "创建人")
     private String createBy;
 
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
@@ -58,15 +60,19 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "流程名称")
     private String processName;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "截止日期")
     private Date deadlineDate;
 
     @ApiModelProperty(value = "流程说明")
     private String processDescription;
 
+    @Dict(dicCode = "esp_application_category")
     @ApiModelProperty(value = "申请类别")
     private String applicationCategory;
 
+    @Dict(dicCode = "esp_project_type")
     @ApiModelProperty(value = "项目类型")
     private String projectType;
 
@@ -100,27 +106,39 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "年代号")
     private String decadeCode;
 
+    @Dict(dicCode = "esp_standard_type")
     @ApiModelProperty(value = "标准类型")
     private String standardType;
 
     @ApiModelProperty(value = "企标等级分类")
     private String enStandardClassification;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "草稿计划完成日期")
     private Date draftPlannedCompleteDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "征求意见稿计划完成日期")
     private Date solicitationDraftPlanCompleteDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "计划报批日期")
     private Date planApprovalDate;
 
+    @Dict(dicCode = "esp_project_status")
     @ApiModelProperty(value = "项目状态")
     private String projectStatus;
 
     @ApiModelProperty(value = "编制说明")
     private String compilationDescription;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "附件文件名")
+    private String compilationFileName;
+
     @ApiModelProperty(value = "零部件名称")
     private String componentName;
 
@@ -139,27 +157,41 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "标准推进人")
     private String standardPromoter;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "草稿完成日期")
     private Date draftCompletionDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "提交草稿日期")
     private Date draftSubmissionDate;
 
+    @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否征求意见")
     private String solicitationOpinionEnabled;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "征求意见稿完成日期")
     private Date solicitationDraftCompletionDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "评审日期")
     private Date reviewDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "报批日期")
     private Date approvalDate;
 
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "发布日期")
     private Date releaseDate;
 
+    @Dict(dicCode = "esp_change_status")
     @ApiModelProperty(value = "变更状态")
     private String changeStatus;
 
@@ -184,6 +216,11 @@ public class EnterpriseStandardPlan implements Serializable {
     @ApiModelProperty(value = "附件")
     private String attachment;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "附件文件名")
+    private String attachmentFileName;
+
+    @Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否为优质标准")
     private String qualityFlag;
 }
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 c0b4796d..95cdb2ac 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
@@ -187,21 +187,35 @@
     <select id="getDetailById" resultType="com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan">
         SELECT
             p.id,
+            p.process_name,
+            p.deadline_date,
+            p.process_description,
             p.application_category,
+            p.project_type,
             p.origin_en_standard_no,
-            p.origin_en_standard_name,
             p.new_en_standard_no,
+            p.origin_en_standard_name,
             p.new_en_standard_name,
-            ad.authDeparts,
+            p.en_standard_english_name,
+            p.en_standard_system,
             p.en_standard_code,
-            cu.cooperateDeparts,
-            u1.name_work_no AS mainDraftingUser,
-            d.depart_name AS mainDraftingUnit,
-            u2.name_work_no AS mainDraftingUnitResponsiblePerson,
-            u3.name_work_no AS standardPromoter,
+            p.en_name_code,
+            p.standard_category_code,
+            p.decade_code,
+            p.standard_type,
+            p.en_standard_classification,
             p.draft_planned_complete_date,
             p.solicitation_draft_plan_complete_date,
             p.plan_approval_date,
+            p.project_status,
+            p.compilation_description,
+            o1.file_name AS compilationFileName,
+            p.component_name,
+            p.applicable_profession,
+            u1.username as mainDraftingUser,
+            d.depart_name as mainDraftingUnit,
+            u2.username as mainDraftingUnitResponsiblePerson,
+            u3.username as promoter,
             p.draft_completion_date,
             p.draft_submission_date,
             p.solicitation_opinion_enabled,
@@ -209,14 +223,24 @@
             p.review_date,
             p.approval_date,
             p.release_date,
-            p.project_status,
-            p.change_status
+            p.change_status,
+            p.project_background,
+            p.similar_na_standards_analysis,
+            p.similar_en_standards_analysis,
+            p.standard_leading_necessity,
+            p.project_expected_effects,
+            p.remarks,
+            p.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.attachment
             LEFT JOIN
                 (SELECT
                 ad.plan_id as id,