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 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> listInfoForExport(@Param("idList") List 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 @@ + + + + + AND (prd.nio_number = #{paramsReportDetailVO.allNumber} or rccpi.params_number = #{paramsReportDetailVO.allNumber}) + + + AND prd.params_name LIKE CONCAT(CONCAT('%',#{paramsReportDetailVO.paramsName}),'%') + + + AND + + prd.cert_category LIKE CONCAT(CONCAT('%',#{item}),'%') + + + + AND prd.sdt in + + #{item} + + + + AND prd.dre in + + #{item} + + + + AND prd.params_manifest_id = #{paramsReportDetailVO.paramsManifestId} + + + + + + @@ -102,9 +137,10 @@ 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 list = pageInfo.getRecords(); // 查询固定列 List 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 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 @@
-
- {{$t('NiONumber')}} +
+ {{$t('ParameterNo')}}
- +