From 6627668f33fbba30780203ccc68b72c6da61d8f9 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 29 Dec 2022 10:44:49 +0800
Subject: [PATCH] =?UTF-8?q?64462=20=E5=8F=82=E8=80=83=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=88=97-=E6=9F=A5=E7=9C=8B=20=E9=85=8D=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9C=AA=E5=9B=9E=E6=98=BE=E5=A4=84=E7=90=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-boot/db/蔚来标准sql/dev_2nd_period.sql     |  4 ++++
 .../cert/collect/entity/ParamsManifestEO.java   |  2 ++
 .../ParamsCollectManifestEOServiceImpl.java     |  4 +++-
 .../controller/ParamsReportEOController.java    | 17 +++++++++++++++++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
index 07bd60c80..722c6a55a 100644
--- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
+++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql
@@ -146,3 +146,7 @@ CREATE TABLE `laws_weilai`.`params_collect_manifest_log`  (
    `params_collect_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数收集清单id',
    PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数收集清单-操作记录(历史日志)' ROW_FORMAT = Dynamic;
+
+-- 参数清单-增加参考列配置id   2022-12-29  未同步生产环境
+ALTER TABLE `laws_weilai`.`params_manifest`
+    ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`;
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
index be60202e5..5294f973c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java
@@ -123,4 +123,6 @@ public class ParamsManifestEO implements Serializable {
     @ApiModelProperty(value = "参数项清单的参考列名称")
     private String referencesColName;
 
+    // 参数项清单的参考列配置id(对应上报库参数配置表（params_report_config）中的id)
+    private String referencesColId;
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 02d078e02..2e243e104 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1144,7 +1144,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
 						String[] references = projectName.split("-");
 						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
-
+						map.put("db_field_id", paramsManifestEO.getReferencesColId());
+						map.put("references_col", true);
 					} else {
 						continue;
 					}
@@ -5432,6 +5433,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
 		paramsManifestEO.setId(paramsManifestId);
 		paramsManifestEO.setReferencesColName(paramsReportConfigName);
+		paramsManifestEO.setReferencesColId(paramsReportConfigId);
 		paramsManifestEOService.updateById(paramsManifestEO);
 
 		// 修改参数项 参考列
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index ba63518c4..251f4c09e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -383,4 +383,21 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
         return super.importExcel(request, response, ParamsReportEO.class);
     }
 
+
+	/**
+	 * 上报库配置 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "上报库配置-通过id查询")
+	@ApiOperation(value="上报库配置-通过id查询", notes="上报库配置-通过id查询")
+	@GetMapping(value = "/queryParamsReportConfigById")
+	public Result<?> queryParamsReportConfigById(@RequestParam(name="id",required=true) String id) {
+		ParamsReportConfigEO paramsReportConfigEO = this.paramsReportConfigEOService.getById(id);
+		if(paramsReportConfigEO==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(paramsReportConfigEO);
+	}
 }