diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 58f829bf..b3ce9159 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto; import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto; import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -61,8 +62,8 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "标准查询") @PostMapping("/findStand") - public List findStand(@RequestParam(value = "page",defaultValue = "1") int page, @RequestParam(value = "size",defaultValue = "10") int size){ - List sarItems = ServiceImpl.selectLawDto(page,size); + public IPage findStand(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "10") int size){ + IPage sarItems = ServiceImpl.selectLawDto(page,size); return sarItems; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java index 7da923fb..0f5aa0d4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java @@ -60,5 +60,7 @@ public interface SarStandItemsDao extends BaseMapper { List selectStandTimeAll(); - List selectStandId(@Param("page")int page,@Param("size")int size); + List selectStandId(@Param("page")int page, @Param("size")int size); + + int selectToken(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java index 441ccefe..ae927b3b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarStandItems.entity.SarItemsTime; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -21,5 +22,5 @@ public interface ISarStandItemsService extends IService { List queryItemsByList(SarStandItemsEOPage page, String resType); List findItemsTime(String type,String ids); - List selectLawDto(int page,int size); + IPage selectLawDto(int page, int size); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index c718629c..ccae3bca 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -12,6 +12,8 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO; import com.adc.da.slrs.sysInfo.service.SysInfoEOService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -144,7 +146,7 @@ public class SarStandItemsServiceImpl extends ServiceImpl selectLawDto(int page,int size) { + public IPage selectLawDto(int page, int size) { List standId = dao.selectStandId(page-1,size); List list = sarLawsAttrDetailedListDao.selectLawsById(standId,null); for (LawsDto lawsDto:list){ @@ -153,7 +155,10 @@ public class SarStandItemsServiceImpl extends ServiceImpl page1=new Page<>(); + page1.setRecords(list); + page1.setTotal(dao.selectToken()); + return page1; } public List findAllItems(String type,String[] ids){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml index bdfce6c0..c4f8461e 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml @@ -663,11 +663,25 @@ select STAND_ID,XCXSSRQ,ZCCSSRQ from sar_stand_attr_info - + SELECT + a.STAND_ID + FROM + sar_stand_items a + LEFT JOIN sar_standards_info b + on a.STAND_ID=b.ID + WHERE b.VALID_FLAG = 0 + GROUP BY + a.STAND_ID + limit #{page},#{size} + + -