修改合同列表统计错误

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HouseholdContractPageDto.java

@@ -11,8 +11,9 @@ import lombok.Data;
  * @createDate: 2023/8/21
  */
 @Data
-public class HouseholdContractPageDto extends Page<HouseholdContract> {
-
+public class HouseholdContractPageDto{
+    private int size;
+    private int current;
     String orderBy;
     Boolean isASC;
     //合同名称

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/HouseholdContractMapper.java

@@ -21,7 +21,7 @@ import java.util.Map;
 public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
 
     @UserEmpower(field ={"hygf_household_contract.regional_companies_code"} ,dealerField={"dealer_code","hygf_household_contract.regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
-    IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto);
+    List<HouseholdContract>  selectPage(@Param("dto") HouseholdContractPageDto dto);
 
     String getHygfCommercialScale(String peasantHouseholdNumber);
 

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

@@ -4,14 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.qiyuesuo.sdk.v2.bean.User;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
-import com.yeejoin.amos.boot.module.hygf.api.dto.ContractDataDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.TemplateParamDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
@@ -94,20 +93,27 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 //        }else{
 //            qw.orderBy(Boolean.TRUE, Boolean.FALSE, "rec_date");
 //        }
-        IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto);
-
-        if(warningQuestionInfoIPage.getRecords() != null && warningQuestionInfoIPage.getRecords().size() > 0) {
-            warningQuestionInfoIPage.getRecords().forEach(e -> {
+        PageHelper.startPage(dto.getCurrent(), dto.getSize());
+        List<HouseholdContract> list = householdContractMapper.selectPage(dto);
+        if(CollectionUtils.isNotEmpty(list)) {
+            list.forEach(e -> {
                 if(e.getPeasantHouseholdNumber() != null) {
                     e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNumber()));
                     e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNumber()));
                 }
             });
-
         }
 
+        PageInfo<HouseholdContract> pages = new PageInfo(list);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<HouseholdContract> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<HouseholdContract>();
+        pagenew.setCurrent(dto.getCurrent());
+        pagenew.setTotal(pages.getTotal());
+        pagenew.setSize(dto.getSize());
+        pagenew.setRecords(pages.getList());
+
+
 
-        return warningQuestionInfoIPage;
+        return pagenew;
     }
 
     //农户注册成功后生成合同