修改分页

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/PartyMemberPointListFormDTO.java

@@ -10,10 +10,14 @@ import java.io.Serializable;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class PartyMemberPointListFormDTO extends PageFormDTO implements Serializable {
+public class PartyMemberPointListFormDTO implements Serializable {
 
     private static final long serialVersionUID = 5659445492756209830L;
 
+    private Integer page;
+
+    private Integer limit;
+
     /**
      * 所属党组织id
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberPointController.java

@@ -117,8 +117,8 @@ public class IcPartyMemberPointController {
     @PostMapping("export")
     public void export(@RequestBody PartyMemberPointListFormDTO formDto, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
 
-        formDto.setIsPage(false);
+
-        formDto.setPageSize(NumConstant.TEN_THOUSAND);
+        formDto.setLimit(NumConstant.TEN_THOUSAND);
 
         ExcelWriter excelWriter = null;
         AtomicInteger i = new AtomicInteger(1);
@@ -135,8 +135,8 @@ public class IcPartyMemberPointController {
                     item.setIndex(i.getAndIncrement());
                 });
                 excelWriter.write(list, writeSheet);
-                formDto.setPageNo(formDto.getPageNo() + NumConstant.ONE);
+                formDto.setPage(formDto.getPage() + NumConstant.ONE);
-            } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDto.getPageSize());
+            } while (CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDto.getLimit());
         } catch (EpmetException e) {
             response.reset();
             response.setCharacterEncoding("UTF-8");

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberPointServiceImpl.java

@@ -161,7 +161,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
      */
     @Override
     public PageData<PartyMemberPointListResultDTO> getList(PartyMemberPointListFormDTO form, TokenDto tokenDto) {
-        PageHelper.startPage(form.getPageNo(), form.getPageSize());
+        PageHelper.startPage(form.getPage(), form.getLimit());
         List<PartyMemberPointListResultDTO> dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(),
                 form.getOrgId(), form.getYear(), tokenDto.getCustomerId());
         PageInfo<PartyMemberPointListResultDTO> pageInfo = new PageInfo<>(dto);
@@ -192,7 +192,7 @@ public class IcPartyMemberPointServiceImpl extends BaseServiceImpl<IcPartyMember
      */
     @Override
     public PageData<PartyMemberPointListResultDTO> getExport(PartyMemberPointListFormDTO form, TokenDto tokenDto) {
-        PageHelper.startPage(form.getPageNo(), form.getPageSize(), form.getIsPage());
+        PageHelper.startPage(form.getPage(), form.getLimit());
         List<PartyMemberPointListResultDTO> dto = baseDao.getList(form.getIdCard(), form.getMobile(), form.getName(),
                 form.getOrgId(), form.getYear(), tokenDto.getCustomerId());
         PageInfo<PartyMemberPointListResultDTO> pageInfo = new PageInfo<>(dto);