联调

src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java

@@ -187,21 +187,21 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 获取当前用户预选记录
      *
-     * @param pageNum  页码
+     * @param pageNumber  页码
      * @param pageSize 分页大小
      * @param personId 用户ID
      * @return
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
-    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+    public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                @RequestParam("personId") String personId,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, orgId, personId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -2,16 +2,15 @@ package com.huiju.estateagents.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaHousingResources;
-import com.huiju.estateagents.entity.TaOrder;
-import com.huiju.estateagents.entity.TaRaiseHouse;
-import com.huiju.estateagents.entity.TaRaiseRecord;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaOrderService;
 import com.huiju.estateagents.service.ITaRaiseHouseService;
@@ -491,14 +490,17 @@ public class TaRaiseRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/taRaiseRecord/list", method = RequestMethod.GET)
-    public ResponseBean wxGetRaiseRecordList(HttpServletRequest request) {
+    public ResponseBean wxGetRaiseRecordList( @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
+            IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
             //获取认筹单列表信息
             QueryWrapper<TaRaiseRecord> taRaiseRecordQueryWrapper = new QueryWrapper<>();
             taRaiseRecordQueryWrapper.eq("org_id",getOrgId(request));
             taRaiseRecordQueryWrapper.eq("person_id",getPersonId(request));
-            List<TaRaiseRecord> list = iTaRaiseRecordService.list(taRaiseRecordQueryWrapper);
+            IPage<TaRaiseRecord> page = iTaRaiseRecordService.page(pg, taRaiseRecordQueryWrapper);
+            List<TaRaiseRecord> list = page.getRecords();
             list.forEach(e -> {
                 //房源与认筹单关系图
                 List<TaRaiseHouse> taRaiseHouseList = taRaiseHouseService.list(new QueryWrapper<TaRaiseHouse>().eq("raise_record_id", e.getRaiseRecordId()));
@@ -508,7 +510,7 @@ public class TaRaiseRecordController extends BaseController {
                 e.setTaHousingResourcesSize(houseList.size());
             });
 
-            responseBean.addSuccess(list);
+            responseBean.addSuccess(page);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("微信端获取认筹单列表信息 -=- {}", e.toString());