认证-上报库-常规导出认证参数绑定上报库

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,

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);
 		}
 

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;
+
 }

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

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>