认证-参数项收集-bug修改

jero-boot/db/蔚来标准sql/dev_2nd_period.sql

@@ -70,3 +70,7 @@ 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);
+ALTER TABLE `laws_weilai`.`params_manifest_history`
+    ADD COLUMN `references_col_name` varchar(255) NULL COMMENT '参数项清单的参考列名称' AFTER `project_version_id`;
+ALTER TABLE `laws_weilai`.`params_info_publish`
+    CHANGE COLUMN `version` `publish_version` int(11) NULL DEFAULT NULL COMMENT '发布时版本' AFTER `params_template_id`;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java

@@ -1341,7 +1341,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsCollectManifestVO.getParamsTemplateId())
-				.eq(ParamsInfoPublishEO::getVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
+				.eq(ParamsInfoPublishEO::getPublishVersion, paramsCollectManifestVO.getParamsTemplatePublishVersion())
 				.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getNioNumber()), ParamsInfoPublishEO::getNioNumber, paramsCollectManifestVO.getNioNumber())
 				.like(StringUtils.isNotEmpty(paramsCollectManifestVO.getParamsName()), ParamsInfoPublishEO::getParamsName, paramsCollectManifestVO.getParamsName())
 				.eq(StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory()), ParamsInfoPublishEO::getDutyTerritory, paramsCollectManifestVO.getDutyTerritory())

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java

@@ -528,7 +528,7 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl<ParamsManifestEOMap
 						&& configId.equals(e.getParamsConfigId())).collect(Collectors.toList());
 				if (CollectionUtil.isNotEmpty(reportConfigDataEOList) && CollectionUtil.isNotEmpty(configDataEOList)) {
 					ParamsConfigDataEO updateParamsConfigDataEO = new ParamsConfigDataEO();
-					updateParamsConfigDataEO.setId(String.valueOf(configDataEOList.get(0)));
+					updateParamsConfigDataEO.setId(String.valueOf(configDataEOList.get(0).getId()));
 					updateParamsConfigDataEO.setTextData((String) reportConfigDataEOList.get(0).get("text_data"));
 					updateParamsConfigDataEO.setPullData((String) reportConfigDataEOList.get(0).get("pull_data"));
 					updateParamsConfigDataEO.setFileConnectId((String) reportConfigDataEOList.get(0).get("file_connect_id"));

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoPublishEO.java

@@ -26,6 +26,6 @@ public class ParamsInfoPublishEO extends ParamsInfoEO implements Serializable {
 
 	/**发布时版本*/
     @ApiModelProperty(value = "发布时版本")
-    private Integer version;
+    private Integer publishVersion;
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/mapper/xml/ParamsInfoPublishEOMapper.xml

@@ -21,12 +21,12 @@
         <result column="control_verify" property="controlVerify" />
         <result column="file_template_connect_id" property="fileTemplateConnectId" />
         <result column="params_template_id" property="paramsTemplateId" />
-        <result column="version" property="version" />
+        <result column="publish_version" property="publishVersion" />
         <result column="title_default_value" property="titleDefaultValue" />
     </resultMap>
 
     <select id="getNewestVersion" resultType="java.lang.Integer" parameterType="java.lang.String">
-        select max(version)
+        select max(publish_version)
         from params_info_publish
         where params_template_id = #{paramsTemplateId}
     </select>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoPublishEOServiceImpl.java

@@ -117,7 +117,7 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl<ParamsInfoPublis
 	public List<ParamsInfoPublishEO> getListByPublishVersion(String paramsTemplateId, int publishVersion) {
 		LambdaQueryWrapper<ParamsInfoPublishEO> queryWrapper = new LambdaQueryWrapper<>();
 		queryWrapper.eq(ParamsInfoPublishEO::getParamsTemplateId, paramsTemplateId)
-				.eq(ParamsInfoPublishEO::getVersion, publishVersion);
+				.eq(ParamsInfoPublishEO::getPublishVersion, publishVersion);
 		List<ParamsInfoPublishEO> paramsInfoPublishEOList = list(queryWrapper);
 		return paramsInfoPublishEOList;
 	}
@@ -151,7 +151,7 @@ public class ParamsInfoPublishEOServiceImpl extends ServiceImpl<ParamsInfoPublis
 			BeanUtils.copyProperties(sourceParamsInfoEO, targetParamsInfoEO);
 			targetParamsInfoEO.setParamsTemplateId(paramsTemplateId);
 			targetParamsInfoEO.setId(UUID.randomUUID().toString().replace("-",""));
-			targetParamsInfoEO.setVersion(newVersion); // 设置发布版本
+			targetParamsInfoEO.setPublishVersion(newVersion); // 设置发布版本
 			targetParamsInfoEO.setCreateTime(new Date());
 			targetParamsInfoEO.setCreateBy(sysUser.getUsername());
 			targetParamsInfoEO.setUpdateTime(new Date());

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -354,6 +354,7 @@
       :footer="null">
       <parameter-column v-if='parametercolumn' @drawerhandleCancel='drawerhandleCancel'
                         @GetgetTableList='GetgetTableList'
+                        @GetgetHeader='GetgetHeader'
                                      :templateTitle='templatetitle'
                                      :selectedRowKeyS='selectedRowKeys' :rowId='rowId' :version='version' :url='url'
                                      :projectId='this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id'>
@@ -845,6 +846,9 @@
       GetgetTableList() {
         this.$refs.CollectionTabel.getTableList(this.queryParamQuery)
       },
+      GetgetHeader(){
+        this.$refs.CollectionTabel.getHeader()
+      },
       // 错误数据的弹框
       cancleoperationFailed() {
         this.selectedRowKeysValue = []

jero-web/src/views/projectManagement/dialog/parametercolumn.vue

@@ -312,6 +312,7 @@
                       this.newVisible = false
                       this.$emit('drawerhandleCancel', false)
                       this.$emit('GetgetTableList')
+                      this.$emit('GetgetHeader')
                       this.$message.success(res.message)
                     } else {
                       this.$message.warning(res.message)