WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
liyawei
2022-12-08 16:43:58 +08:00
parent 333a2d1a98
commit aaeb47a27a
8 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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());