成果管理的翻页

src/main/java/com/ruoyi/project/ys/service/impl/YsqqXmxxServiceImpl.java

@@ -2,6 +2,8 @@ package com.ruoyi.project.ys.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
+
+import com.github.pagehelper.Page;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.framework.web.page.PageDomain;
 import com.ruoyi.framework.web.page.TableSupport;
@@ -10,6 +12,7 @@ import com.ruoyi.project.ys.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.ys.service.IYsqqXmxxService;
+import org.springframework.util.CollectionUtils;
 
 import static com.ruoyi.common.utils.SecurityUtils.getUserId;
 
@@ -139,7 +142,7 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
     public List<YsqqXmxx> yscgList(YsqqXmxx ysqqXmxx)
     {
         //项目信息
-        List<YsqqXmxx>   xmxxList  = ysqqXmxxMapper.selectYsqqXmxxList(ysqqXmxx);
+        Page<YsqqXmxx> xmxxList  = (Page<YsqqXmxx>)ysqqXmxxMapper.selectYsqqXmxxList(ysqqXmxx);
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
@@ -152,7 +155,7 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
         YscgWjscqk yscgWjscqk = new YscgWjscqk();
         List<YscgWjscqk>    zlscList = yscgWjscqkMapper.selectYscgWjscqkList(yscgWjscqk);
 
-        List<YsqqXmxx> jctzList =   new ArrayList<>();
+        Page<YsqqXmxx> jctzList =  new Page<>();
         for (YsqqXmxx item1 : xmxxList) {
             PXH++;
             for (YscgZllx item2 : zllxList) {
@@ -182,6 +185,9 @@ public class YsqqXmxxServiceImpl implements IYsqqXmxxService
                     .count();
             item3.setZlsl((int) count);
         }
+        jctzList.setTotal(CollectionUtils.isEmpty(xmxxList) ? 0 : xmxxList.getTotal());
+        jctzList.setPageNum(pageNum);
+        jctzList.setPageSize(pageSize);
         return  jctzList;
     }
 }