mofify: 分页查询

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -6,6 +6,7 @@
  */
 package com.netease.mail.yanxuan.change.biz.biz;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -614,14 +615,15 @@ public class ChangeFlowBiz {
         return changeFlowVO;
     }
 
-    public PageInfo<ChangeRecord> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
+    public PageInfo<ChangeFlowVO> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
         log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize, JSON.toJSONString(changeFlowListQueryReq));
         //进行分页
         PageHelper.startPage(page,pageSize);
-        return new PageInfo<ChangeRecord>(changeRecordMapper.selectByCondition(changeFlowListQueryReq));
-        // List<ChangeFlowVO> list = new ArrayList<>();
+        PageInfo<ChangeRecord> changeRecordPageInfo = new PageInfo<>(changeRecordMapper.selectByCondition(changeFlowListQueryReq));
+        List<ChangeRecord> changeRecords = changeRecordPageInfo.getList();
+        List<ChangeFlowVO> list = new ArrayList<>();
         // 处理数据
-        /*if (CollectionUtils.isNotEmpty(changeRecords)) {
+        if (CollectionUtils.isNotEmpty(changeRecords)) {
             list = changeRecords.stream().map(c -> {
                 ChangeFlowVO changeFlowVO = new ChangeFlowVO();
                 changeFlowVO.setId(c.getId());
@@ -656,7 +658,13 @@ public class ChangeFlowBiz {
                 changeFlowVO.setRemark(c.getRemark());
                 return changeFlowVO;
             }).collect(Collectors.toList());
-        }*/
+        }
+        PageInfo<ChangeFlowVO> changeFlowVOPageInfo = new PageInfo<>(list);
+        changeFlowVOPageInfo.setPageNum(changeRecordPageInfo.getPageNum());
+        changeFlowVOPageInfo.setPageSize(changeRecordPageInfo.getPageSize());
+        changeFlowVOPageInfo.setSize(changeRecordPageInfo.getSize());
+        changeFlowVOPageInfo.setPages(changeRecordPageInfo.getPages());
+        return changeFlowVOPageInfo;
     }
 
     public UserBaseContainerDTO getOperator(InterfaceInputDTO interfaceInput) {

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeFlowController.java

@@ -65,7 +65,7 @@ public class ChangeFlowController {
      * @return
      */
     @GetMapping("/query")
-    public AjaxResult<PageInfo<ChangeRecord>> query(@RequestParam(name = "page", defaultValue = "1") Integer page,
+    public AjaxResult<PageInfo<ChangeFlowVO>> query(@RequestParam(name = "page", defaultValue = "1") Integer page,
                                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                     @RequestParam(name = "itemId", required = false) String itemId,
                                                     @RequestParam(name = "supplier", required = false) String supplier,