modify: 工单列表查询

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

@@ -67,8 +67,10 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowExecVO;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowListVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ItemVO;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.PageVO;
 import com.netease.mail.yanxuan.change.integration.excel.ChangeFlowExcelDTO;
 import com.netease.mail.yanxuan.change.integration.flow.FlowRpcService;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
@@ -666,7 +668,7 @@ public class ChangeFlowBiz {
         return changeFlowVO;
     }
 
-    public PageInfo<ChangeFlowVO> query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
+    public ChangeFlowListVO query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
         log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize, JSON.toJSONString(changeFlowListQueryReq));
         //进行分页
         PageHelper.startPage(page,pageSize);
@@ -704,12 +706,31 @@ public class ChangeFlowBiz {
                 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;
+        PageVO pageVO = buildPageVo(list.size(), pageSize, page);
+        ChangeFlowListVO changeFlowListVO = new ChangeFlowListVO();
+        changeFlowListVO.setPageVo(pageVO);
+        changeFlowListVO.setChangeFlowList(list);
+        return changeFlowListVO;
+    }
+
+    /**
+     * 构建分页信息
+     *
+     * @param totalCount
+     * @param pageSize
+     * @param page
+     * @return
+     */
+    private PageVO buildPageVo(int totalCount, Integer pageSize, Integer page) {
+        int totalPage;
+        int i = totalCount % pageSize;
+        if (i != 0) {
+            totalPage = totalCount / pageSize + 1;
+        } else {
+            totalPage = totalCount / pageSize;
+        }
+        return PageVO.builder().page(page).totalPage(totalPage).pageSize(pageSize).pageCount(pageSize)
+                .totalCount(totalCount).build();
     }
 
     public UserBaseContainerDTO getOperator(InterfaceInputDTO interfaceInput) {

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/ChangeFlowListVO.java

@@ -8,8 +8,10 @@ package com.netease.mail.yanxuan.change.dal.meta.model.vo;
 
 import java.util.List;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author zcwang
@@ -17,6 +19,8 @@ import lombok.Data;
  */
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class ChangeFlowListVO {
 
     /**

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/vo/PageVO.java

@@ -16,16 +16,16 @@ public class PageVO {
     /**
      * 当前页
      */
-    private Long page;
+    private Integer page;
     /**
      * 总页数
      */
-    private Long totalPage;
+    private Integer totalPage;
 
     /**
      * 总条数
      */
-    private Long totalCount;
+    private Integer totalCount;
 
     /**
      * 每页条数

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

@@ -28,6 +28,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowDeliverReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowSubmitReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.BasicChangeFlowVO;
+import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowListVO;
 import com.netease.mail.yanxuan.change.dal.meta.model.vo.ChangeFlowVO;
 import com.netease.yanxuan.flowx.sdk.meta.dto.exec.InterfaceInputDTO;
 import com.netease.yanxuan.flowx.sdk.meta.dto.exec.UserBaseContainerDTO;
@@ -65,18 +66,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<ChangeFlowListVO> 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);