From 936f1000f5d941f6863dab3e95db7202463c6aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Wed, 14 Dec 2022 18:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E4=BF=AE=E6=94=B9=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BC=96=E5=8F=B7=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/mapper/xml/ParamsCollectManifestEOMapper.xml    | 6 +-----
 .../service/impl/ParamsCollectManifestEOServiceImpl.java    | 3 ++-
 .../cert/report/mapper/xml/ParamsReportDetailEOMapper.xml   | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
index f8147c1a5..8f67b0ddb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml
@@ -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>
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 b10ff8fdb..266db793e 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
@@ -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(","));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
index 967d482ac..b6a68d6a0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/xml/ParamsReportDetailEOMapper.xml
@@ -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>