From c5bf32bc6c9488f9d8a5ca847392aa42baee5c77 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 12 Jul 2022 09:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E5=B8=B8=E8=A7=84=E5=AF=BC=E5=87=BA=E8=AE=A4=E8=AF=81=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=BB=91=E5=AE=9A=E4=B8=8A=E6=8A=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_third_record.sql                 | 4 ++++
 .../service/impl/ParamsCollectManifestEOServiceImpl.java      | 1 +
 .../cert/report/entity/ReportCertCategoryParamsInfoEO.java    | 4 ++++
 .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml     | 3 ++-
 .../mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml       | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql
index 6f67d579a..b3ad6c4a9 100644
--- a/jero-boot/db/蔚来标准sql/dev_third_record.sql
+++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql
@@ -239,6 +239,10 @@ CREATE TABLE `laws_technology_evaluation`  (
    PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '法规技术评估表' ROW_FORMAT = DYNAMIC;
 
+-- 上报库认证类别参数信息 添加字段 2022-07-11
+ALTER TABLE `laws_weilai`.`report_cert_category_params_info`
+    ADD COLUMN `params_manifest_id` varchar(50) NULL COMMENT '上报库id' AFTER `version`;
+
 --  法规技术评估-流程明细表
 CREATE TABLE `laws_technology_evaluation_flow_detail`  (
    `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index ff8f7c289..a11e3fb76 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1552,6 +1552,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			ReportCertCategoryParamsInfoEO addCcpi = new ReportCertCategoryParamsInfoEO();
 			BeanUtils.copyProperties(ccpi, addCcpi);
 			addCcpi.setId(UUID.randomUUID().toString().replace("-",""));
+			addCcpi.setParamsManifestId(reportId); // 绑定上报库
 			addReportCertCategoryParamsInfoEOList.add(addCcpi);
 		}
 
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
index 8ca30076c..80937575f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/entity/ReportCertCategoryParamsInfoEO.java
@@ -29,4 +29,8 @@ public class ReportCertCategoryParamsInfoEO extends CertCategoryParamsInfoEO imp
     @ApiModelProperty(value = "发布时版本")
     private Integer version;
 
+    /**上报库id*/
+    @ApiModelProperty(value = "上报库id")
+    private String paramsManifestId;
+
 }
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index b539d2703..819e1af14 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -103,10 +103,11 @@
         prd.id as id,
         prd.nio_number as nio_number,
         prd.params_name as params_name,
+        prd.control_type as control_type,
         rccpi.params_number as cert_number,
         rccpi.params_name as cert_params_name
         from params_report_detail prd
-        left join report_cert_category_params_info rccpi on prd.nio_number = rccpi.nio_number
+        left join report_cert_category_params_info rccpi on (prd.params_manifest_id = rccpi.params_manifest_id  and prd.nio_number = rccpi.nio_number)
         <include refid="BaseQuerySqlForExport"/>
         <if test="idList != null and idList.size > 0">
             and prd.id in
diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
index cc2317fb5..d73208e9f 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/mapper/xml/ReportCertCategoryParamsInfoEOMapper.xml
@@ -15,5 +15,6 @@
         <result column="cert_category" property="certCategory" />
         <result column="params_template_id" property="paramsTemplateId" />
         <result column="version" property="version" />
+        <result column="params_manifest_id" property="paramsManifestId" />
     </resultMap>
 </mapper>
\ No newline at end of file