1.测算表模板分页修改

biz-base/src/main/java/com/dayou/controller/TmplAssetCalculateController.java

@@ -34,8 +34,8 @@ public class TmplAssetCalculateController {
     * 资产测算表模板信息表列表
     */
     @GetMapping("/page")
-    public Result<PageInfo<TmplAssetCalculate>> page(TmplAssetCalculate tmplAssetCalculate, PageInfo page){
-        PageInfo<TmplAssetCalculate> pages=tmplAssetCalculateService.selectPage(page,tmplAssetCalculate);
+    public Result<Page<TmplAssetCalculate>> page(TmplAssetCalculate tmplAssetCalculate, Page page){
+        Page<TmplAssetCalculate> pages=tmplAssetCalculateService.selectPage(page,tmplAssetCalculate);
         return Result.build(pages);
     }
 

service/src/main/java/com/dayou/service/TmplAssetCalculateService.java

@@ -4,9 +4,7 @@ import com.dayou.common.DropDownBoxData;
 import com.dayou.entity.TmplAssetCalculate;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayou.vo.TmplAssetCalculateDetailVO;
-import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
@@ -20,7 +18,7 @@ import java.util.List;
  */
 public interface TmplAssetCalculateService extends IService<TmplAssetCalculate> {
 
-    PageInfo<TmplAssetCalculate> selectPage(PageInfo page, TmplAssetCalculate tmplAssetCalculate);
+    Page<TmplAssetCalculate> selectPage(Page page, TmplAssetCalculate tmplAssetCalculate);
 
     TmplAssetCalculateDetailVO detail(Long id);
 

service/src/main/java/com/dayou/service/impl/TmplAssetCalculateServiceImpl.java

@@ -8,17 +8,11 @@ import com.dayou.mapper.TmplAssetCalculateSectionMapper;
 import com.dayou.service.TmplAssetCalculateService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dayou.vo.TmplAssetCalculateDetailVO;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 
 import java.util.List;
 import java.util.ArrayList;
@@ -43,10 +37,9 @@ public class TmplAssetCalculateServiceImpl extends ServiceImpl<TmplAssetCalculat
     private TmplAssetCalculateSectionMapper tmplAssetCalculateSectionMapper;
 
     @Override
-    public PageInfo<TmplAssetCalculate> selectPage(PageInfo page, TmplAssetCalculate tmplAssetCalculate) {
-        PageHelper.startPage(page.getPageNum(), page.getPageSize());
-        PageInfo<TmplAssetCalculate> pageInfo = new PageInfo<>(this.list(new QueryWrapper<TmplAssetCalculate>(tmplAssetCalculate)));
-        return pageInfo;
+    @SuppressWarnings("unchecked")
+    public Page<TmplAssetCalculate> selectPage(Page page, TmplAssetCalculate tmplAssetCalculate) {
+        return this.page(page, new QueryWrapper<TmplAssetCalculate>(tmplAssetCalculate));
     }
 
     @Override