审批页面修改

application-webadmin/src/main/java/com/ankaibei/workFlow/webadmin/ankaibei/controller/CostInfoController.java

@@ -232,9 +232,6 @@ public class CostInfoController {
     public ResMsg listRuntimeTaskByExpense(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
-        //---查询到所有的任务量
-        listRuntimeTaskRequestVo.setPageNum(1);
-        listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "费用报销";
@@ -256,9 +253,6 @@ public class CostInfoController {
     public ResMsg listRuntimeTaskByManHour(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
-        //---查询到所有的任务量
-        listRuntimeTaskRequestVo.setPageNum(1);
-        listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "人员工时";
@@ -277,9 +271,6 @@ public class CostInfoController {
     @PostMapping("/listRuntimeTaskByProjectAdd")
     public ResMsg listRuntimeTaskByProjectAdd(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
-        //---查询到所有的任务量
-        listRuntimeTaskRequestVo.setPageNum(1);
-        listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(TokenData.takeFromRequest().getLoginName(), listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "新建项目";
@@ -299,10 +290,6 @@ public class CostInfoController {
     public ResMsg listRuntimeTaskByProjectTaskAdd(
             @RequestBody ListRuntimeTaskRequestVo listRuntimeTaskRequestVo) {
         String username = TokenData.takeFromRequest().getLoginName();
-        //---查询到所有的任务量
-        final Integer pageNum = listRuntimeTaskRequestVo.getPageNum();
-        listRuntimeTaskRequestVo.setPageNum(1);
-        listRuntimeTaskRequestVo.setPageSize(flowWorkOrderService.getCountByCondition(""));
         MyPageData<Task> pageDataTwo = flowApiService.getTaskListByUserName(username, listRuntimeTaskRequestVo);
         List<FlowTaskVo> flowTaskVoList = flowApiService.convertToFlowTaskList(pageDataTwo.getDataList());
         String queryType = "新建任务";

common/common-flow/src/main/java/com/ankaibei/workFlow/common/flow/service/impl/FlowApiServiceImpl.java

@@ -574,8 +574,7 @@ public class FlowApiServiceImpl implements FlowApiService {
         this.buildCandidateCondition(query, username);
         long totalCount = query.count();
         query.orderByTaskCreateTime().desc();
-        int firstResult = (listRuntimeTaskRequestVo.getPageNum() - 1) * listRuntimeTaskRequestVo.getPageSize();
-        List<Task> taskList = query.listPage(firstResult, listRuntimeTaskRequestVo.getPageSize());
+        List<Task> taskList = query.list();
         return new MyPageData<>(taskList, totalCount);
     }