瀏覽代碼

LY activiti分页

ly 2 年之前
父節點
當前提交
8548a50aaf

+ 16 - 0
master/src/main/java/com/ruoyi/common/utils/PageUtils.java

@@ -0,0 +1,16 @@
+package com.ruoyi.common.utils;
+
+
+import java.util.Map;
+
+/**
+ *
+ * @author
+ */
+public class PageUtils {
+
+    public static int getStart(Map<String, Object> params) {
+        return (Integer.parseInt((String) params.get("pageNum")) - 1) * Integer.parseInt((String) params.get("pageSize"));
+    }
+
+}

+ 13 - 0
master/src/main/java/com/ruoyi/framework/web/controller/BaseController.java

@@ -92,6 +92,19 @@ public class BaseController
         return rspData;
     }
 
+    /**
+     * 响应请求分页数据
+     */
+    protected TableDataInfo getDataTable(List<?> list , long count)
+    {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(count);
+        return rspData;
+    }
+
     /**
      * 响应返回结果
      *

+ 9 - 6
master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.project.ehs.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.http.HttpContextUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -226,7 +229,7 @@ public class TApproveDangerController extends BaseController {
         List<HistoricProcessInstance> historicProcessInstanceList =
                 historyService.createHistoricProcessInstanceQuery()
                         .startedBy(getUserId().toString()).orderByProcessInstanceStartTime().desc()//参与者,组任务查询
-                        .listPage(Integer.parseInt((String) params.get("pageNum")) - 1, Integer.parseInt((String) params.get("pageSize")));
+                        .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
         Long count = historyService.createHistoricProcessInstanceQuery()
                 .startedBy(getUserId().toString()).count();
         logger.info(JSON.toJSONString(historicProcessInstanceList));
@@ -318,7 +321,7 @@ public class TApproveDangerController extends BaseController {
                 logger.info("devProcess:" + devProcess);
                 list.add(devProcess);
             }
-        return getDataTable(list);
+        return getDataTable(list , count);
     }
 
     /**
@@ -332,7 +335,7 @@ public class TApproveDangerController extends BaseController {
                 .taskCandidateOrAssigned(getUserId().toString())
 //                .taskAssignee(getUserId().toString())
                 .orderByTaskCreateTime().desc()//参与者,组任务查询
-                .listPage(Integer.parseInt((String) params.get("pageNum")) - 1, Integer.parseInt((String) params.get("pageSize")));
+                .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
         //分页数据
         Long count = processEngine.getTaskService().createTaskQuery().taskCandidateUser(getUserId().toString()).count();
         List<DevTask> list = new ArrayList<>();
@@ -425,7 +428,7 @@ public class TApproveDangerController extends BaseController {
                 list.add(devTask);
             }
         }
-        return getDataTable(list);
+        return getDataTable(list,count);
     }
 
     /**
@@ -437,7 +440,7 @@ public class TApproveDangerController extends BaseController {
         List<HistoricTaskInstance> taskList = historyService.createHistoricTaskInstanceQuery()
                 .taskAssignee(getUserId().toString())
                 .finished().orderByHistoricTaskInstanceEndTime().desc()
-                .listPage(Integer.parseInt((String) params.get("pageNum")) - 1, Integer.parseInt((String) params.get("pageSize")));
+                .listPage(PageUtils.getStart(params), Integer.parseInt((String) params.get("pageSize")));
         //分页数据
         Long count = historyService.createHistoricTaskInstanceQuery()
                 .taskAssignee(getUserId().toString())
@@ -548,7 +551,7 @@ public class TApproveDangerController extends BaseController {
                 list.add(devProcess);
             }
         }
-        return getDataTable(list);
+        return getDataTable(list,count);
     }
 
     /**