add: 分页查询

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

@@ -611,14 +611,14 @@ public class ChangeFlowBiz {
         return changeFlowVO;
     }
 
-    public PageInfo<ChangeFlowVO> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
+    public PageInfo<ChangeRecord> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
         log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize, JSON.toJSONString(changeFlowListQueryReq));
         //进行分页
         PageHelper.startPage(page,pageSize);
-        List<ChangeRecord> changeRecords = changeRecordMapper.selectByCondition(changeFlowListQueryReq);
-        List<ChangeFlowVO> list = new ArrayList<>();
+        return new PageInfo<ChangeRecord>(changeRecordMapper.selectByCondition(changeFlowListQueryReq));
+        // 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());
@@ -653,8 +653,7 @@ public class ChangeFlowBiz {
                 changeFlowVO.setRemark(c.getRemark());
                 return changeFlowVO;
             }).collect(Collectors.toList());
-        }
-        return new PageInfo<>(list);
+        }*/
     }
 
     public UserBaseContainerDTO getOperator(InterfaceInputDTO interfaceInput) {

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

@@ -23,6 +23,7 @@ import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.common.util.DateUtils;
+import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCancelReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowCreateReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
@@ -64,18 +65,18 @@ public class ChangeFlowController {
      * @return
      */
     @GetMapping("/query")
-    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,
-        @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
-        @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
-        @RequestParam(name = "changeState", required = false) Integer changeState,
-        @RequestParam(name = "changeCommander", required = false) String changeCommander,
-        @RequestParam(name = "changeDepartment", required = false) String changeDepartment,
-        @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
-        @RequestParam(name = "startTime", required = false) Long startTime,
-        @RequestParam(name = "endTime", required = false) Long endTime) {
+    public AjaxResult<PageInfo<ChangeRecord>> 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,
+                                                    @RequestParam(name = "parentChangeClassId", required = false) Long parentChangeClassId,
+                                                    @RequestParam(name = "sonChangeClassId", required = false) Long sonChangeClassId,
+                                                    @RequestParam(name = "changeState", required = false) Integer changeState,
+                                                    @RequestParam(name = "changeCommander", required = false) String changeCommander,
+                                                    @RequestParam(name = "changeDepartment", required = false) String changeDepartment,
+                                                    @RequestParam(name = "changeExecDepartment", required = false) String changeExecDepartment,
+                                                    @RequestParam(name = "startTime", required = false) Long startTime,
+                                                    @RequestParam(name = "endTime", required = false) Long endTime) {
         ChangeFlowListQueryReq changeFlowListQueryReq = new ChangeFlowListQueryReq();
         changeFlowListQueryReq.setItemId(itemId);
         changeFlowListQueryReq.setSupplier(supplier);