存量合同2.0开发 接口补充

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HistoryPeasantHouseholdServiceImpl.java

@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
 import com.yeejoin.amos.boot.module.hygf.api.entity.FinancingInfoHistory;
@@ -25,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 存量合同电站服务实现类
@@ -41,12 +44,16 @@ public class HistoryPeasantHouseholdServiceImpl extends BaseService<HistoryPeasa
      * 分页查询
      */
     public Page<HistoryPeasantHouseholdDto> queryForHistoryPeasantHouseholdPage(Page<HistoryPeasantHouseholdDto> page, @Condition(Operator.in) List<String> sequenceNbr,@Condition(Operator.like) String ownersName ,@Condition(Operator.like) String province,@Condition(Operator.eq) String status)   {
+
+        PageHelper.startPage((int) page.getCurrent(), (int) page.getSize());
         List<HistoryPeasantHouseholdDto> historyPeasantHouseholdDtos = this.getBaseMapper().queryForPage(sequenceNbr, ownersName, province, status);
         historyPeasantHouseholdDtos.forEach(e->{
             e.setFileUrl(JSONArray.parseArray(e.getFiles()));
         });
-
-        return this. queryForPage(page, null, false,sequenceNbr,ownersName,province,status);
+        PageInfo<HistoryPeasantHouseholdDto> infos = new PageInfo<>(historyPeasantHouseholdDtos);
+        page.setRecords(historyPeasantHouseholdDtos);
+        page.setTotal(infos.getTotal());
+        return page;
     }
 
     /**