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

临时修改搜索编号导致的参数重复问题

Browse Source
This commit is contained in:
高嵩
2022-12-14 18:23:57 +08:00
parent 62a1c1795e
commit 936f1000f5
3 changed files with 4 additions and 8 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/mapper/xml/ParamsCollectManifestEOMapper.xml
+1 -5
View File
@@ -130,13 +130,9 @@
<select id="selectpage" resultMap="ParamsCollectManifestEOResultMap">
select *
from (
select DISTINCT pcm.*,
ccpip.params_number as params_number
select pcm.*
from params_collect_manifest pcm
left join cert_category_params_info_publish ccpip on pcm.nio_number = ccpip.nio_number
where pcm.params_manifest_id = #{paramsManifestEO.id}
and ccpip.params_template_id = #{paramsManifestEO.paramsTemplateId}
and ccpip.version = #{paramsManifestEO.paramsTemplatePublishVersion}
) temp
${ew.customSqlSegment}
</select>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+2 -1
View File
@@ -364,7 +364,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}
// 搜索NIO编号或认证类别编号 精确搜索
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getAllNumber())) {
queryWrapper.and(wrapper->wrapper.eq("nio_number", paramsCollectManifestVO.getAllNumber()).or().eq("params_number", paramsCollectManifestVO.getAllNumber()));
//queryWrapper.and(wrapper->wrapper.eq("nio_number", paramsCollectManifestVO.getAllNumber()).or().eq("params_number", paramsCollectManifestVO.getAllNumber()));
queryWrapper.and(wrapper->wrapper.like("nio_number", paramsCollectManifestVO.getAllNumber()));
}
if (StringUtils.isNotEmpty(paramsCollectManifestVO.getDutyTerritory())) {
List<String> dutyTerritoryList = Arrays.asList(paramsCollectManifestVO.getDutyTerritory().split(","));
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+1 -2
View File
@@ -71,7 +71,7 @@
<where>
<if test="paramsReportDetailVO != null">
<if test="paramsReportDetailVO.allNumber !=null and paramsReportDetailVO.allNumber !=''">
AND (prd.nio_number = #{paramsReportDetailVO.allNumber} or rccpi.params_number = #{paramsReportDetailVO.allNumber})
AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.allNumber}),'%')
</if>
<if test="paramsReportDetailVO.paramsName !=null and paramsReportDetailVO.paramsName !=''">
AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%')
@@ -141,7 +141,6 @@
<select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
select prd.*
from params_report_detail prd
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="BaseQuerySql2"/>
order by sync_time desc, nio_number asc
</select>