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 9b921b33..03be8495 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 @@ -234,20 +234,12 @@ public class SarStandardComplianceAssessResultController { public ResponseMessage selectNationalStandard(InterpretationEO eo) throws Exception { if (eo.getPosition() == 1) { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - //如果查询条件里标准编号不为空,查询 - if (eo.getStandNumber() != null) queryWrapper.like("STAND_NUMBER",eo.getStandNumber()); - //如果查询条件里标准名称不为空,查询 - if (eo.getStandName() != null) queryWrapper.like("STAND_NAME",eo.getStandName()); - //如果查询条件里具体章条不为空,查询 - if (eo.getSpecificItem() != null) queryWrapper.like("specific_item",eo.getSpecificItem()); - - if (eo.getInterpretationTime() != null) queryWrapper.eq("INTERPRETATION_TIME", eo.getInterpretationTime()); - if (eo.getStandId() != null) queryWrapper.eq("STAND_ID", eo.getStandId()); - - IPage page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper); - while (page.getRecords().remove(null)) ; - return Result.success(page); + List standards=iSarInterpretationNationalStandardService.getAllDatas(eo); + Integer datasCount=iSarInterpretationNationalStandardService.getAllDatasCount(eo); + iPage.setTotal(datasCount); + iPage.setRecords(standards); + while (iPage.getRecords().remove(null)) ; + return Result.success(iPage); } else { IPage iPage = new Page<>(eo.getCurrent(), eo.getSize()); QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java index 5b0f285a..b7a3094c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/dao/SarInterpretationNationalStandardDao.java @@ -1,9 +1,12 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.dao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* Mapper 接口 @@ -16,4 +19,8 @@ public interface SarInterpretationNationalStandardDao extends BaseMapper getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCout(InterpretationEO sarInterpretationNationalStandard); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java index 3efb40f5..52e6e773 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/ISarInterpretationNationalStandardService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.baomidou.mybatisplus.extension.service.IService; @@ -18,4 +19,8 @@ public interface ISarInterpretationNationalStandardService extends IService sarInterpretationNationalStandards); boolean updateData(SarInterpretationNationalStandard findStandDto); + + List getAllDatas(InterpretationEO sarInterpretationNationalStandard); + + Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java index b5137a93..5986628f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/service/impl/SarInterpretationNationalStandardServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandardComplianceAssessResult.service.impl; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarStandardComplianceProductAssessDao; +import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.InterpretationEO; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarInterpretationNationalStandard; import com.adc.da.slrs.sarStandardComplianceAssessResult.dao.SarInterpretationNationalStandardDao; import com.adc.da.slrs.sarStandardComplianceAssessResult.entity.SarStandardComplianceProductAssess; @@ -55,4 +56,14 @@ public class SarInterpretationNationalStandardServiceImpl extends ServiceImpl getAllDatas(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatas(sarInterpretationNationalStandard); + } + + @Override + public Integer getAllDatasCount(InterpretationEO sarInterpretationNationalStandard) { + return sarInterpretationNationalStandardDao.getAllDatasCout(sarInterpretationNationalStandard); + } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml index a722018f..69179058 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardComplianceAssessResult/SarInterpretationNationalStandardMapper.xml @@ -14,4 +14,75 @@ and sar_interpretation_national_standard.STAND_NAME=#{find.standName} and sar_interpretation_national_standard.INTERPRETATION_TIME = #{find.interpretationTime} + + +