diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java index 42640ba1..680d71df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java @@ -50,9 +50,9 @@ public class SarStandardComplianceAssessResultController { @ApiOperation(value = "条件查询标准清单") @GetMapping("/standard") public ResponseMessage selectStandard(SarStandardsInfoEO eo) throws Exception { - if(StringUtils.isNotBlank(eo.getStandNumber())){ - eo.setStandNumber(eo.getStandNumber().replace(" ","  ")); - } +// if(StringUtils.isNotBlank(eo.getStandNumber())){ +// eo.setStandNumber(eo.getStandNumber().replace(" ","  ")); +// } if (eo.getStandApplicationType() == 1) { QueryWrapper queryWrapper = new QueryWrapper<>(); IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java index 6cf6e1b8..880f782d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarStandardComplianceProductAssessDao.java @@ -24,4 +24,8 @@ public interface SarStandardComplianceProductAssessDao extends BaseMapper selectPagesCount(@Param("product")unCountDTO productAssess); + List selectByPages(@Param("page")Long page,@Param("pageSize")Long size,@Param("product") SarStandardComplianceProductAssess productAssess); + + List selectByPagesCount(@Param("product")SarStandardComplianceProductAssess productAssess); + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml index a40576d8..894b5c40 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarStandardComplianceProductAssessMapper.xml @@ -88,4 +88,38 @@ ORDER BY sar_stand_project_library.project_name ASC + + + +