参数收集、参数模板管理、上报库管理，检索编号问题处理。

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

@@ -386,7 +386,24 @@ 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.like("nio_number", paramsCollectManifestVO.getAllNumber()));
+			//queryWrapper.and(wrapper->wrapper.like("nio_number", paramsCollectManifestVO.getAllNumber()));
+
+			QueryWrapper<CertCategoryParamsInfoPublishEO> categoryParamsQueryWrap = new QueryWrapper<>();
+			categoryParamsQueryWrap.lambda().eq(CertCategoryParamsInfoPublishEO::getParamsNumber,paramsCollectManifestVO.getAllNumber());
+			List<CertCategoryParamsInfoPublishEO> categoryParamsList = this.certCategoryParamsInfoPublishEOService.list(categoryParamsQueryWrap);
+
+			queryWrapper.and(wrapper -> {
+				wrapper.eq("nio_number",paramsCollectManifestVO.getAllNumber());
+				if(CollectionUtils.isNotEmpty(categoryParamsList)){
+					List<String> nioNumberList = categoryParamsList.stream().map(CertCategoryParamsInfoPublishEO::getNioNumber)
+							.collect(Collectors.toList());
+					if(CollectionUtils.isNotEmpty(nioNumberList)){
+						wrapper.or(wrap -> {
+							wrap.in("nio_number",nioNumberList);
+						});
+					}
+				}
+			});
 		}
 		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

@@ -71,7 +71,10 @@
         <where>
             <if test="paramsReportDetailVO != null">
                 <if test="paramsReportDetailVO.allNumber !=null and paramsReportDetailVO.allNumber !=''">
-                    AND prd.nio_number LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.allNumber}),'%')
+                    AND (
+                        prd.nio_number = #{paramsReportDetailVO.allNumber}
+                        or prd.nio_number in (select nio_number from report_cert_category_params_info rccpi where rccpi.params_number = #{paramsReportDetailVO.allNumber})
+                    )
                 </if>
                 <if test="paramsReportDetailVO.paramsName !=null and paramsReportDetailVO.paramsName !=''">
                     AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%')
@@ -188,4 +191,4 @@
         and prcd.params_config_id = #{paramsReportConfigId}
     </select>
 
-</mapper>
+</mapper>

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java

@@ -10,13 +10,16 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO;
 import com.jero.modules.cert.template.entity.ParamsInfoEO;
+import com.jero.modules.cert.template.service.ICertCategoryParamsInfoEOService;
 import com.jero.modules.cert.template.service.IParamsInfoEOService;
 import com.jero.modules.cert.template.service.IParamsInfoPublishEOService;
 import com.jero.modules.cert.template.vo.ParamsInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -47,7 +51,10 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 
 	@Autowired
 	private IParamsInfoPublishEOService paramsInfoPublishEOService;
-	
+
+	@Autowired
+	private ICertCategoryParamsInfoEOService certCategoryParamsInfoEOService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -83,9 +90,24 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 
 		QueryWrapper<ParamsInfoEO> queryWrapper = new QueryWrapper<>();
 		String finalAllNumber = allNumber;
-		queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId())
+		queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId());
-				.and(StringUtils.isNotEmpty(allNumber), wrapper->wrapper.eq("pi.nio_number", finalAllNumber).or().eq("ccpi.params_number", finalAllNumber))
+		if(StringUtils.isNotEmpty(allNumber)){
-				.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName())
+			queryWrapper.and(wrapper->wrapper.eq("pi.nio_number", finalAllNumber));
+
+			QueryWrapper<CertCategoryParamsInfoEO> categoryParamsQueryWrap = new QueryWrapper<>();
+			categoryParamsQueryWrap.lambda().eq(CertCategoryParamsInfoEO::getParamsNumber,finalAllNumber);
+			List<CertCategoryParamsInfoEO> certCategoryParamsInfoEOList = this.certCategoryParamsInfoEOService.list(categoryParamsQueryWrap);
+
+			if(CollectionUtils.isNotEmpty(certCategoryParamsInfoEOList)){
+				List<String> nioNumberList = certCategoryParamsInfoEOList.stream().map(CertCategoryParamsInfoEO::getNioNumber).collect(Collectors.toList());
+				if(CollectionUtils.isNotEmpty(nioNumberList)){
+					queryWrapper.or(wrap -> {
+						wrap.in("pi.nio_number",nioNumberList);
+					});
+				}
+			}
+		}
+		queryWrapper.like(StringUtils.isNotEmpty(paramsInfoEO.getParamsName()), "pi.params_name", paramsInfoEO.getParamsName())
 				.eq(StringUtils.isNotEmpty(paramsInfoEO.getDutyTerritory()), "pi.duty_territory", paramsInfoEO.getDutyTerritory())
 				.orderBy(true, "asc".equals(orderBy)?true:false, "pi.nio_number");
 		Page<ParamsInfoEO> page = new Page<ParamsInfoEO>(pageNo, pageSize);

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

@@ -180,7 +180,6 @@
     <select id="selectpage" resultMap="ParamsInfoEOResultMap">
         select DISTINCT pi.*
         from params_info pi
-        left join cert_category_params_info ccpi on pi.nio_number = ccpi.nio_number and pi.params_template_id = ccpi.params_template_id
         ${ew.customSqlSegment}
     </select>
-</mapper>
+</mapper>