认证-参数项收集-更新参考列

2022-12-07 14:59:21 +08:00
parent f7db59dca4
commit c7003bba5b
16 changed files with 566 additions and 10 deletions
@@ -59,4 +59,14 @@ CREATE TABLE `params_report_detail_log` (
    `params_report_id` varchar(36) DEFAULT NULL COMMENT '上报库id',
    `params_report_detail_id` varchar(36) DEFAULT NULL COMMENT '上报库参数项id',
    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest`
+    ADD COLUMN `references_col` varchar(5000) NULL COMMENT '参考列' AFTER `version`;
+
+ALTER TABLE `laws_weilai`.`params_collect_manifest_history`
+    ADD COLUMN `references_col` varchar(5000) NULL COMMENT '参考列' AFTER `version`;
+ALTER TABLE `laws_weilai`.`params_manifest`
+    ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`;
+
+INSERT INTO `laws_weilai`.`onl_cgform_field`(`id`, `cgform_head_id`, `db_field_name`, `db_field_en_name`, `db_field_txt`, `order_num`, `db_field_name_old`, `db_is_key`, `db_is_null`, `db_type`, `db_length`, `db_point_length`, `db_default_val`, `dict_field`, `dict_table`, `dict_text`, `field_show_type`, `field_href`, `field_length`, `field_valid_type`, `field_must_input`, `field_extend_json`, `field_default_value`, `is_query`, `is_show_form`, `is_show_list`, `is_read_only`, `query_mode`, `main_table`, `main_field`, `update_by`, `update_time`, `create_time`, `create_by`, `converter`, `query_def_val`, `query_dict_text`, `query_dict_field`, `query_dict_table`, `query_show_type`, `query_config_flag`, `query_valid_type`, `query_must_input`, `sort_flag`, `show_area`, `is_show_laws_list`, `is_show_search`, `is_delete`, `is_model`, `dict_id`) VALUES ('a183d186bc94f0db002bbb070017f14c', '9ca1773d2a484d2fadae38491ad51aa1', 'references_col', ' References Column', '参考列', 14, NULL, 0, 1, 'string', 500, 0, '', '', '', '', 'text', '', 120, NULL, '0', '', '', 0, 0, 1, 0, 'single', '', '', NULL, NULL, '2022-12-06 14:29:12', 'admin', '', '', '', '', '', 'text', '0', NULL, NULL, '0', NULL, NULL, NULL, 0, '7', NULL);
@@ -56,9 +56,10 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 	@GetMapping(value = "/getHeader")
 //	@RequiresPermissions("params:collectManifest:list")
 	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId,
+													   @RequestParam(name = "projectName") String projectName,
 													   @RequestParam(name = "flag") String flag,
 													   @RequestParam(name = "cut") String cut) {
-		List<Map<String, Object>> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut);
+		List<Map<String, Object>> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut, projectName);
 		return Result.OK(list);
 	}

@@ -565,6 +566,48 @@ public class ParamsCollectManifestEOController extends JeroController<ParamsColl
 		return Result.OK(msgList);
 	}

+	/**
+	 * 认证工程师-引用参考列
+	 *
+	 * @param paramsReportId
+	 * @param paramsReportId
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-认证工程师-引用参考列")
+	@ApiOperation(value="参数项收集清单-认证工程师-引用参考列", notes="参数项收集清单-认证工程师-引用参考列")
+	@GetMapping(value = "/addReferencesCol")
+//	@RequiresPermissions("params:collectManifest:save")
+	public Result<?> addReferencesCol(@RequestParam(value = "paramsManifestId") String paramsManifestId,
+									  @RequestParam(value = "paramsReportId") String paramsReportId,
+									  @RequestParam(value = "paramsReportConfigId") String paramsReportConfigId,
+									  @RequestParam(value = "paramsReportConfigName") String paramsReportConfigName) {
+		boolean isSuccess = paramsCollectManifestEOService.addReferencesCol(paramsManifestId, paramsReportId, paramsReportConfigId, paramsReportConfigName);
+		if (isSuccess) {
+			return Result.OK("引用参考列成功！");
+		} else {
+			return Result.error("引用参考列失败！");
+		}
+	}
+
+	/**
+	 * 认证工程师-更新参考列
+	 *
+	 * @param paramsCollectManifestVO
+	 * @return
+	 */
+	@AutoLog(value = "参数项收集清单-认证工程师-更新参考列")
+	@ApiOperation(value="参数项收集清单-认证工程师-更新参考列", notes="参数项收集清单-认证工程师-更新参考列")
+	@PostMapping(value = "/updateReferencesCol")
+//	@RequiresPermissions("params:collectManifest:save")
+	public Result<?> updateReferencesCol(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) {
+		boolean isSuccess = paramsCollectManifestEOService.updateReferencesCol(paramsCollectManifestVO.getConfigDataList(), paramsCollectManifestVO.getParamsManifestId());
+		if (isSuccess) {
+			return Result.OK("更新参考列成功！");
+		} else {
+			return Result.error("更新参考列失败！");
+		}
+	}
+



@@ -53,6 +53,9 @@ public class ParamsCollectManifestEO extends ParamsCollectManifestBaseEO impleme
    @ApiModelProperty(value = "版本")
    private Integer version;

+    @ApiModelProperty(value = "参考列")
+    private String referencesCol;
+
 	@TableField(exist = false)
    private String userTypes;

@@ -34,4 +34,7 @@ public class ParamsCollectManifestHistoryEO extends ParamsCollectManifestBaseEO

    @ApiModelProperty(value = "版本")
    private Integer version;
+
+    @ApiModelProperty(value = "参考列")
+    private String referencesCol;
 }
@@ -112,4 +112,7 @@ public class ParamsManifestEO implements Serializable {
    @ApiModelProperty(value = "项目相关版本对应的项目id")
    private String projectVersionId;

+    @ApiModelProperty(value = "参数项清单的参考列名称")
+    private String referencesColName;
+
 }
@@ -32,6 +32,7 @@
        <result column="title_default_value" property="titleDefaultValue" />
        <result column="report_time" property="reportTime" />
        <result column="version" property="version" />
+        <result column="references_col" property="referencesCol" />
    </resultMap>
    <sql id="BaseQuerySql">
        <where>
@@ -29,6 +29,7 @@
        <result column="title_default_value" property="titleDefaultValue" />
        <result column="report_time" property="reportTime" />
        <result column="version" property="version" />
+        <result column="references_col" property="referencesCol" />
    </resultMap>
    <sql id="BaseQuerySql">
        <where>
@@ -19,6 +19,7 @@
        <result column="project_version" property="projectVersion" />
        <result column="explanation" property="explanation" />
        <result column="project_version_id" property="projectVersionId" />
+        <result column="references_col_name" property="referencesColName" />
    </resultMap>
    <resultMap id="ParamsManifestEOResultMapForCopy" type="com.jero.modules.cert.collect.vo.ParamsManifestVO">
        <id column="id" property="id" />
@@ -16,5 +16,6 @@
        <result column="project_id" property="projectId" />
        <result column="params_template_publish_version" property="paramsTemplatePublishVersion" />
        <result column="source_params_manifest_id" property="sourceParamsManifestId" />
+        <result column="references_col_name" property="referencesColName" />
    </resultMap>
 </mapper>
@@ -86,7 +86,7 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	 * @param cut
 	 * @return
 	 */
-	List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut);
+	List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut, String projectName);

 	/**
 	 * 提交
@@ -182,4 +182,9 @@ public interface IParamsCollectManifestEOService extends IService<ParamsCollectM
 	//监控参数收集任务的截止时间，并根据时间段发送飞书
 	void checkDeadline();

+	// 认证工程师-引用参考列
+	boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName);
+
+	// 认证工程师-更新参考列
+	boolean updateReferencesCol(List<Map<String, Object>> configDataList, String paramsManifestId);
 }
@@ -436,6 +436,20 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			String controlType = collectManifestEO.getControlType();
 			String paramsCollectManifestId = collectManifestEO.getId();

+			Map<String, Object> referencesColMap = new HashMap<>();
+			String referencesCol = collectManifestEO.getReferencesCol();
+			if (StringUtils.isNotBlank(referencesCol)) {
+				List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, referencesCol, collectManifestEO, userTypes); // 重新组合配置数据
+				referencesColMap.put("controlType", controlType);
+				referencesColMap.put("list", referencesColVOList);
+				manifestMap.put("referencesCol", referencesColMap);
+			} else {
+				List<ParamsConfigDataVO> referencesColVOList = getReferencesColList(controlType, " # # #", collectManifestEO, userTypes); // 重新组合配置数据
+				referencesColMap.put("controlType", controlType);
+				referencesColMap.put("list", referencesColVOList);
+				manifestMap.put("referencesCol", referencesColMap);
+			}
+
 			if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
 				paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置
 					Map<String, Object> configMap = new HashMap<>();
@@ -747,6 +761,279 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		return paramsConfigDataVOList;
 	}

+	/**
+	 * 重新组装配置数据 用于返回前端
+	 * @param controlType
+	 * @param referencesCol
+	 * @param paramsCollectManifestEO
+	 * @return
+	 */
+    private List<ParamsConfigDataVO> getReferencesColList(String controlType, String referencesCol, ParamsCollectManifestEO paramsCollectManifestEO, String userTypes) {
+		List<String> referencesColList = Arrays.asList(referencesCol.split("#"));
+		List<ParamsConfigDataVO> paramsConfigDataVOList = new ArrayList<>();
+		String templateId = null;
+		String templateName = null;
+		if (StringUtils.isNotEmpty(paramsCollectManifestEO.getFileTemplateConnectId())) {
+			List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(paramsCollectManifestEO.getFileTemplateConnectId());
+
+			if (CollectionUtil.isNotEmpty(ossFiles)) {
+				templateId = ossFiles.get(0).getId();
+				templateName = ossFiles.get(0).getFileName();
+			}
+		}
+
+		String lockFlag = ConfigLockEnum.YES.getValue();
+		if (CollectManifestUserTypeEnum.HOMO.getValue().equals(userTypes)) {
+			lockFlag = ConfigLockEnum.NO.getValue();
+		}
+		if (ControlTypeEnum.TEXT.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(lockFlag);
+			configDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
+			if (StringUtils.isNotBlank(referencesColList.get(0))) {
+				configDataVO.setDataValue(referencesColList.get(0));
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(lockFlag);
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				configDataVO.setDataValue(referencesColList.get(1));
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(lockFlag);
+			configDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				configDataVO.setDataValue(referencesColList.get(1));
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO configDataVO = new ParamsConfigDataVO();
+			configDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			configDataVO.setIsMust(paramsCollectManifestEO.getIsMust());
+			configDataVO.setIsLock(lockFlag);
+			configDataVO.setTemplateId(templateId);
+			configDataVO.setTemplateName(templateName);
+			if (StringUtils.isNotBlank(referencesColList.get(2))) {
+				configDataVO.setDataValue(referencesColList.get(2));
+			}
+			paramsConfigDataVOList.add(configDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			textConfigDataVO.setIsLock(lockFlag);
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
+			if (StringUtils.isNotBlank(referencesColList.get(0))) {
+				textConfigDataVO.setDataValue(referencesColList.get(0));
+			}
+
+			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
+			pullConfigDataVO.setIsLock(lockFlag);
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				pullConfigDataVO.setDataValue(referencesColList.get(1));
+			}
+
+			paramsConfigDataVOList.add(pullConfigDataVO);
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				pullMoreConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				pullMoreConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			textConfigDataVO.setIsLock(lockFlag);
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
+			if (StringUtils.isNotBlank(referencesColList.get(0))) {
+				textConfigDataVO.setDataValue(referencesColList.get(0));
+			}
+
+			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
+			pullMoreConfigDataVO.setIsLock(lockFlag);
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				pullMoreConfigDataVO.setDataValue(referencesColList.get(1));
+			}
+
+			paramsConfigDataVOList.add(pullMoreConfigDataVO);
+			paramsConfigDataVOList.add(textConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			textConfigDataVO.setIsLock(lockFlag);
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
+			if (StringUtils.isNotBlank(referencesColList.get(0))) {
+				textConfigDataVO.setDataValue(referencesColList.get(0));
+			}
+
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsLock(lockFlag);
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (StringUtils.isNotBlank(referencesColList.get(2))) {
+				fileConfigDataVO.setDataValue(referencesColList.get(2));
+			}
+
+			paramsConfigDataVOList.add(textConfigDataVO);
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
+			pullConfigDataVO.setIsLock(lockFlag);
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				pullConfigDataVO.setDataValue(referencesColList.get(1));
+			}
+
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsLock(lockFlag);
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (StringUtils.isNotBlank(referencesColList.get(2))) {
+				fileConfigDataVO.setDataValue(referencesColList.get(2));
+			}
+
+			paramsConfigDataVOList.add(pullConfigDataVO);
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				pullMoreConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				pullMoreConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue());
+			pullMoreConfigDataVO.setIsLock(lockFlag);
+			pullMoreConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				pullMoreConfigDataVO.setDataValue(referencesColList.get(1));
+			}
+
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsLock(lockFlag);
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (StringUtils.isNotBlank(referencesColList.get(2))) {
+				fileConfigDataVO.setDataValue(referencesColList.get(2));
+			}
+
+			paramsConfigDataVOList.add(pullMoreConfigDataVO);
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		} else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) {
+
+			ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO();
+			ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO();
+
+			if (ParamsIsMustEnum.YES.getValue().equals(paramsCollectManifestEO.getIsMust())) {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.YES.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			} else {
+				pullConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				textConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+				fileConfigDataVO.setIsMust(ParamsIsMustEnum.NO.getValue());
+			}
+
+			textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue());
+			textConfigDataVO.setIsLock(lockFlag);
+			textConfigDataVO.setControlVerify(paramsCollectManifestEO.getControlVerify());
+			if (StringUtils.isNotBlank(referencesColList.get(0))) {
+				textConfigDataVO.setDataValue(referencesColList.get(0));
+			}
+
+			pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue());
+			pullConfigDataVO.setIsLock(lockFlag);
+			pullConfigDataVO.setControlValue(getControlValueMapList(paramsCollectManifestEO.getControlValues()));
+			if (StringUtils.isNotBlank(referencesColList.get(1))) {
+				pullConfigDataVO.setDataValue(referencesColList.get(1));
+			}
+
+			fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue());
+			fileConfigDataVO.setIsLock(lockFlag);
+			fileConfigDataVO.setTemplateId(templateId);
+			fileConfigDataVO.setTemplateName(templateName);
+			if (StringUtils.isNotBlank(referencesColList.get(2))) {
+				fileConfigDataVO.setDataValue(referencesColList.get(2));
+			}
+
+			paramsConfigDataVOList.add(pullConfigDataVO);
+			paramsConfigDataVOList.add(textConfigDataVO);
+			paramsConfigDataVOList.add(fileConfigDataVO);
+
+		}
+		return paramsConfigDataVOList;
+	}
+
 	private List<Map<String, String>> getControlValueMapList(String controlValue) {
 		List<Map<String, String>> controlValueMapList = new ArrayList<>();
    	if (StringUtils.isNotEmpty(controlValue)) {
@@ -771,12 +1058,13 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 	 * @return
 	 */
 	@Override
-	public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut) {
+	public List<Map<String, Object>> getHeader(String paramsManifestId, String flag, String cut, String projectName) {
 		List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7
 		if (fieldList.size() != 0) {
 			//过滤列表字段(is_show_list-->列表是否显示0否 1是)
 			fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList());
 		}
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
 		List<ParamsConfigEO> paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId);
 		List<Map<String, Object>> listConfig = new LinkedList<>();
 		for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) {
@@ -803,7 +1091,6 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				}
 			}
 			if ("description".equals(dbFieldName)) {
-				indexOfDescription = i;
 				map.put("click2", true);
 			}
 			if ("duty_territory".equals(dbFieldName)) {
@@ -812,11 +1099,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 			if ("sdt".equals(dbFieldName)) {
 				map.put("click", true);
 			}
-			map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
+
+			if ("description".equals(dbFieldName) && StringUtils.isBlank(paramsManifestEO.getReferencesColName())) {
+				indexOfDescription = i;
+			} else if ("references_col".equals(dbFieldName) && StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+				indexOfDescription = i;
+			}
+
+			if (!"references_col".equals(dbFieldName)) {
+				map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
+			}
 			if(CutEnum.CN.getValue().equals(cut)){
-				map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
-			}else{
-				map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				if ("references_col".equals(dbFieldName)) {
+					if (StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+						map.put("type", true); // 标识
+						map.put("flag", true); // 标识
+						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());//字段中文名
+
+					}
+				} else {
+					map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
+				}
+			}else {
+				if ("references_col".equals(dbFieldName)) {
+					if ( StringUtils.isNotBlank(paramsManifestEO.getReferencesColName())) {
+						map.put("type", true); // 标识
+						map.put("flag", true); // 标识
+						map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
+						String[] references = projectName.split("-");
+						map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + onlCgformField.getDbFieldEnName());//字段中文名
+
+					}
+				} else {
+					map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名
+				}
 			}
 			list.add(map);
 		}
@@ -4617,6 +4935,142 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec

 	}

+	@Override
+	public boolean addReferencesCol(String paramsManifestId, String paramsReportId, String paramsReportConfigId, String paramsReportConfigName) {
+		// 获取清单参数项
+		ParamsCollectManifestEO queryEO = new ParamsCollectManifestEO();
+		queryEO.setParamsManifestId(paramsManifestId);
+		List<ParamsCollectManifestEO> paramsCollectManifestEOList = paramsCollectManifestEOMapper.listInfo(queryEO);
+
+		// 获取上报库的配置数据
+		List<ParamsReportConfigDataEO> paramsReportConfigDataEOList = paramsReportDetailEOService.listInfoForReferencesCol(paramsReportId, paramsReportConfigId);
+
+		// 配置数据重构后入库
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		for (ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOList) {
+			StringBuilder referencesColBuilder = new StringBuilder();
+			if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getTextData())) {
+				referencesColBuilder.append(paramsReportConfigDataEO.getTextData()).append("#");
+			} else {
+				referencesColBuilder.append(" ").append("#");
+			}
+
+			if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getPullData())) {
+				referencesColBuilder.append(paramsReportConfigDataEO.getPullData()).append("#");
+			} else {
+				referencesColBuilder.append(" ").append("#");
+			}
+
+			if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) {
+				referencesColBuilder.append(paramsReportConfigDataEO.getFileConnectId()).append("#");
+			} else {
+				referencesColBuilder.append(" ").append("#");
+			}
+
+			String referencesCol = referencesColBuilder.toString();
+			List<ParamsCollectManifestEO> pcmList = paramsCollectManifestEOList.stream()
+					.filter(e->paramsReportConfigDataEO.getNioNumber().equals(e.getNioNumber())).collect(Collectors.toList());
+			if (CollectionUtil.isNotEmpty(pcmList)) {
+				if (pcmList.get(0).getControlType().equals(paramsReportConfigDataEO.getControlType())) { // 控件类型相同 才能引用
+					ParamsCollectManifestEO updateCollectManifestEO = new ParamsCollectManifestEO();
+					updateCollectManifestEO.setId(pcmList.get(0).getId());
+					updateCollectManifestEO.setReferencesCol(referencesCol);
+					updateEOList.add(updateCollectManifestEO);
+				}
+			}
+
+		}
+
+		// 修改参数清单的参考列名称
+		ParamsManifestEO paramsManifestEO = new ParamsManifestEO();
+		paramsManifestEO.setId(paramsManifestId);
+		paramsManifestEO.setReferencesColName(paramsReportConfigName);
+		paramsManifestEOService.updateById(paramsManifestEO);
+
+		// 修改参数项 参考列
+		return  updateBatchById(updateEOList);
+	}
+
+	@Override
+	public boolean updateReferencesCol(List<Map<String, Object>> configDataList, String paramsManifestId) {
+		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
+		// 处理数据
+		for (Map<String, Object> map : configDataList) {
+			String paramsCollectManifestId = (String) map.get("id");
+
+			// 添加配置数据
+			for (Map.Entry<String, Object> entry : map.entrySet()) {
+				StringBuilder referncesColBuilder = new StringBuilder();
+				ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
+				if ("id".equals(entry.getKey())) {
+					continue;
+				}
+
+				// 取值
+				Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
+				// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
+				List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
+				if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
+					for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
+						String type = (String) paramsConfigDataVO.get("type");
+						String dataValue = (String) paramsConfigDataVO.get("dataValue");
+
+						if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
+							if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
+								// 处理文件connectId
+								String[] fileIdList = dataValue.split(",");
+								String connectId = UUID.randomUUID().toString().replace("-", "");
+								List<OSSFile> updateFileList = new ArrayList<>();
+								for (int i = 0; i < fileIdList.length; i++) {
+									OSSFile ossFile = new OSSFile();
+									ossFile.setId(fileIdList[i]);
+									ossFile.setConnectId(connectId);
+									updateFileList.add(ossFile);
+								}
+								ossFileService.updateBatchById(updateFileList);
+								dataValue = connectId;
+							} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
+								List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
+								if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
+									String connectId = UUID.randomUUID().toString().replace("-", "");
+									//修改文件表关联信息connect_id
+									List<OSSFile> oSSFileList = new ArrayList<>();
+									for (String fileId : dataValue.split(",")) {
+										OSSFile ossFile = new OSSFile();
+										ossFile.setId(fileId);
+										ossFile.setConnectId(connectId);
+										oSSFileList.add(ossFile);
+									}
+									ossFileService.updateFileInfo(oSSFileList);
+									dataValue = connectId;
+								}
+							}
+
+						}
+
+						if (StringUtils.isNotEmpty(dataValue)) {
+							referncesColBuilder.append(dataValue).append("#");
+						}  else {
+							referncesColBuilder.append(" ").append("#");
+						}
+					}
+				}
+
+				String referencesCol = referncesColBuilder.toString();
+				if (StringUtils.isNotEmpty(referencesCol)) {
+					ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
+					updateEO.setId(paramsCollectManifestId);
+					updateEO.setReferencesCol(referencesCol);
+					updateEOList.add(updateEO);
+				}
+
+			}
+		}
+
+		// 批量更新
+		return updateBatchById(updateEOList);
+	}
+
 	private void deadlineDateMap(Map<String, List<String>> today, ParamsCollectManifestEO collectManifestEO, String thirdId) {
 		List<String> stringList = today.get(thirdId);
 		if (ObjectUtils.isEmpty(stringList)) {
@@ -1,5 +1,6 @@
 package com.jero.modules.cert.report.entity;

+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jero.modules.cert.collect.entity.ParamsConfigDataEO;
 import io.swagger.annotations.ApiModel;
@@ -24,4 +25,10 @@ import java.io.Serializable;
 public class ParamsReportConfigDataEO extends ParamsConfigDataEO implements Serializable {
    private static final long serialVersionUID = 1L;

+    @TableField(exist = false)
+    private String nioNumber;
+
+    @TableField(exist = false)
+    private String controlType;
+
 }
@@ -2,6 +2,7 @@ package com.jero.modules.cert.report.mapper;

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
 import org.apache.ibatis.annotations.Param;
@@ -25,4 +26,7 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai
                                                @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);

    List<Map<String, Object>> listInfoForChange(@Param("paramsReportId") String paramsReportId);
+
+    List<ParamsReportConfigDataEO> listInfoForReferencesCol(@Param("paramsReportId") String paramsReportId,
+                                                            @Param("paramsReportConfigId") String paramsReportConfigId);
 }
@@ -178,4 +178,15 @@
        where prd.params_manifest_id = #{paramsReportId}
    </select>

+    <select id="listInfoForReferencesCol" resultType="com.jero.modules.cert.report.entity.ParamsReportConfigDataEO">
+        select
+            prcd.*,
+            prd.control_type,
+            prd.nio_number
+        from params_report_detail prd
+                 left join params_report_config_data prcd on prd.id = prcd.params_collect_manifest_id
+        where prd.params_manifest_id = #{paramsReportId}
+        and prcd.params_config_id = #{paramsReportConfigId}
+    </select>
+
 </mapper>
@@ -2,9 +2,9 @@ package com.jero.modules.cert.report.service;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.cert.report.entity.ParamsReportConfigDataEO;
 import com.jero.modules.cert.report.entity.ParamsReportDetailEO;
 import com.jero.modules.cert.report.vo.ParamsReportDetailVO;
-import org.apache.ibatis.annotations.Param;

 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -63,5 +63,9 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 	// 删除
 	boolean deleteByIds(List<String> ids);

+	// 变更扩展时的查询
 	List<Map<String, Object>> listInfoForChange(String paramsReportId);
+
+	// 引用参考列时的查询
+	List<ParamsReportConfigDataEO> listInfoForReferencesCol(String paramsReportId, String paramsReportConfigId);
 }
@@ -1844,6 +1844,11 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 		return this.baseMapper.listInfoForChange(paramsReportId);
 	}

+	@Override
+	public List<ParamsReportConfigDataEO> listInfoForReferencesCol(String paramsReportId, String paramsReportConfigId) {
+		return this.baseMapper.listInfoForReferencesCol(paramsReportId, paramsReportConfigId);
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象