From 27a1ab323109edcc414a5c7690875cfce10ab796 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 1 Dec 2022 10:38:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5=E5=BA=93-?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsReportDetailEOController.java       |  9 ++--
 .../mapper/ParamsReportDetailEOMapper.java    |  2 +-
 .../mapper/xml/ParamsReportDetailEOMapper.xml | 42 +++++++++++++++++--
 .../service/IParamsReportDetailEOService.java |  4 +-
 .../impl/ParamsReportDetailEOServiceImpl.java |  6 +--
 .../cert/report/vo/ParamsReportDetailVO.java  |  2 +-
 .../controller/ParamsInfoEOController.java    |  5 ++-
 .../parameter/managementdetails/index.vue     |  8 ++--
 8 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
index ffda2322b..555d4312e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportDetailEOController.java
@@ -21,7 +21,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -84,8 +83,8 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 							   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 							   @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
 							   @RequestParam(name = "cut") String cut) {
-		if (StringUtils.isNotEmpty(paramsReportDetailVO.getNioNumber())) {
-			paramsReportDetailVO.setNioNumber(paramsReportDetailVO.getNioNumber().replace("%","\\%"));
+		if (StringUtils.isNotEmpty(paramsReportDetailVO.getAllNumber())) {
+			paramsReportDetailVO.setAllNumber(paramsReportDetailVO.getAllNumber().replace("%","\\%"));
 		}
 		if (StringUtils.isNotEmpty(paramsReportDetailVO.getParamsName())) {
 			paramsReportDetailVO.setParamsName(paramsReportDetailVO.getParamsName().replace("%","\\%"));
@@ -98,9 +97,7 @@ public class ParamsReportDetailEOController extends JeroController<ParamsReportD
 		}
 
 		IPage page = new Page(pageNo, pageSize);
-		ParamsReportDetailEO paramsReportDetailEO = new ParamsReportDetailEO();
-		BeanUtils.copyProperties(paramsReportDetailVO, paramsReportDetailEO);
-		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailEO, cut);
+		IPage list = paramsReportDetailEOService.queryList(page, paramsReportDetailVO, cut);
 		return Result.OK(list);
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
index 9953f73a4..ce0e77e8c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/mapper/ParamsReportDetailEOMapper.java
@@ -19,7 +19,7 @@ public interface ParamsReportDetailEOMapper extends BaseMapper<ParamsReportDetai
 
     List<ParamsReportDetailEO> listInfo(@Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
 
-    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailEO") ParamsReportDetailEO paramsReportDetailEO);
+    IPage pageInfo(@Param("page") IPage page, @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
 
     List<Map<String, Object>> listInfoForExport(@Param("idList") List<String> idList,
                                                 @Param("paramsReportDetailVO") ParamsReportDetailVO paramsReportDetailVO);
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 01a75cc51..b4f4de794 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
@@ -65,6 +65,41 @@
         </where>
     </sql>
 
+    <sql id="BaseQuerySql2">
+        <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})
+                </if>
+                <if test="paramsReportDetailVO.paramsName !=null and paramsReportDetailVO.paramsName !=''">
+                    AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%')
+                </if>
+                <if test="paramsReportDetailVO.certCategory !=null and paramsReportDetailVO.certCategory !=''">
+                    AND
+                    <foreach collection="paramsReportDetailVO.certCategory.split(',')" index="" item="item" open="(" close=")" separator="or">
+                        prd.cert_category LIKE CONCAT(CONCAT('%',#{item}),'%')
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailVO.sdt !=null and paramsReportDetailVO.sdt !=''">
+                    AND prd.sdt in
+                    <foreach collection="paramsReportDetailVO.sdt.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailVO.dre !=null and paramsReportDetailVO.dre !=''">
+                    AND prd.dre in
+                    <foreach collection="paramsReportDetailVO.dre.split(',')" index="" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                <if test="paramsReportDetailVO.paramsManifestId !=null and paramsReportDetailVO.paramsManifestId !=''">
+                    AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId}
+                </if>
+
+            </if>
+        </where>
+    </sql>
+
     <sql id="BaseQuerySqlForExport">
         <where>
             <if test="paramsReportDetailVO != null">
@@ -102,9 +137,10 @@
     </select>
 
     <select id="pageInfo" resultMap="ParamsReportDetailEOResultMap">
-        select *
-        from params_report_detail
-        <include refid="BaseQuerySql"/>
+        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>
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
index 7dece4f71..0427070c3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/IParamsReportDetailEOService.java
@@ -21,11 +21,11 @@ public interface IParamsReportDetailEOService extends IService<ParamsReportDetai
 	/**
 	 * 列表查询
 	 * @param page
-	 * @param paramsReportDetailEO
+	 * @param paramsReportDetailVO
 	 * @param cut
 	 * @return
 	 */
-	IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut);
+	IPage queryList(IPage page, ParamsReportDetailVO paramsReportDetailVO, String cut);
 
 	/**
 	 * 列表表头中英文切换
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 9528cf673..d53ae54b0 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -110,10 +110,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
 	 * @return
 	 */
 	@Override
-	public IPage queryList(IPage page, ParamsReportDetailEO paramsReportDetailEO, String cut) {
-		String paramsManifestId = paramsReportDetailEO.getParamsManifestId();
+	public IPage queryList(IPage page, ParamsReportDetailVO paramsReportDetailVO, String cut) {
+		String paramsManifestId = paramsReportDetailVO.getParamsManifestId();
 
-		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailEO); // 查询固定列
+		IPage pageInfo = paramsReportDetailEOMapper.pageInfo(page, paramsReportDetailVO); // 查询固定列
 		List<ParamsReportDetailEO> list = pageInfo.getRecords(); // 查询固定列
 		List<ParamsReportConfigEO> paramsConfigEOList = paramsReportConfigEOService.queryList(paramsManifestId); // 查询配置列
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
index ae6b8e521..9a90907b7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/vo/ParamsReportDetailVO.java
@@ -58,6 +58,6 @@ public class ParamsReportDetailVO {
     // 自定义导出专用
     private String exportTemplateId; //导出模板id
 
-
+    private String allNumber;
 
 }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
index e41276d3a..1443702ba 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/controller/ParamsInfoEOController.java
@@ -71,7 +71,7 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 								   HttpServletRequest req) {
 
 		if (StringUtils.isNotEmpty(allNumber)) {
-			paramsInfoEO.setNioNumber(allNumber.replace("%","\\%"));
+			allNumber = allNumber.replace("%","\\%");
 		}
 		if (StringUtils.isNotEmpty(paramsInfoEO.getParamsName())) {
 			paramsInfoEO.setParamsName(paramsInfoEO.getParamsName().replace("%","\\%"));
@@ -82,8 +82,9 @@ public class ParamsInfoEOController extends JeroController<ParamsInfoEO, IParams
 
 
 		QueryWrapper<ParamsInfoEO> queryWrapper = new QueryWrapper<>();
+		String finalAllNumber = allNumber;
 		queryWrapper.eq("pi.params_template_id", paramsInfoEO.getParamsTemplateId())
-				.and(StringUtils.isNotEmpty(allNumber), wrapper->wrapper.eq("pi.nio_number", allNumber).or().eq("ccpi.params_number", allNumber))
+				.and(StringUtils.isNotEmpty(allNumber), wrapper->wrapper.eq("pi.nio_number", finalAllNumber).or().eq("ccpi.params_number", finalAllNumber))
 				.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");
diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue
index 5f2b8165b..e8d2dbbc8 100644
--- a/jero-web/src/views/parameter/managementdetails/index.vue
+++ b/jero-web/src/views/parameter/managementdetails/index.vue
@@ -26,11 +26,11 @@
             </a-col>
             <a-col :md="6" :sm="8">
               <div class="box-title-text">
-                <div class="title-text" :title="$t('NiONumber')">
-                  <span>{{$t('NiONumber')}}</span>
+                <div class="title-text" :title="$t('ParameterNo')">
+                  <span>{{$t('ParameterNo')}}</span>
                 </div>
-                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('NiONumber')"
-                         v-model="formInline.nioNumber"></a-input>
+                <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('ParameterNo')"
+                         v-model="formInline.allNumber"></a-input>
               </div>
             </a-col>
             <a-col :md="6" :sm="8">