From 690b5ff07ace78fa1f3f4fa1b0508481cf182919 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 31 七月 2023 11:09:02 +0800
Subject: [PATCH] 修复单兵端 - 下发给我的任务列表分页问题
---
ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageHelper.java | 18 ++++++
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 2
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 2
ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageInfo.java | 137 +++++++++++++++++++++++++++++++++++++++++++++
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 12 +++-
5 files changed, 166 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index beada3f..2208a01 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -13,6 +13,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.pagehelper.JpaPageHelper;
+import com.ruoyi.utils.pagehelper.JpaPageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.catalina.security.SecurityUtil;
@@ -59,10 +61,14 @@
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
@PreAuthorize("@ss.hasPermi('app:task:list')")
@GetMapping("/listWithDetail")
- public TableDataInfo userlist(ArdAppTask ardAppTask) {
- startPage();
+ public AjaxResult userlist(ArdAppTask ardAppTask) {
+ Integer pageNum = ardAppTask.getPageNum();
+ Integer pageSize = ardAppTask.getPageSize();
List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
- return getDataTable(ardAppTasks);
+ /*鍒嗛〉鏂瑰紡1*/
+ JpaPageHelper.startPage(pageNum,pageSize);
+ JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
+ return AjaxResult.success(pageInfo);
}
@ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index 765a95f..f8d1f06 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -84,6 +84,8 @@
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
ardAppTask.setUserId(SecurityUtils.getUserId());
+ ardAppTask.setPageNum(null);
+ ardAppTask.setPageSize(null);
List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
List<ArdAppTask> list = new ArrayList<>();
list.addAll(list1);
diff --git a/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageHelper.java b/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageHelper.java
new file mode 100644
index 0000000..fdd31a4
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageHelper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.utils.pagehelper;
+
+/**
+ * @Description:
+ * @ClassName: JpaPageHelper
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�07鏈�31鏃�10:42:16
+ * @Version: 1.0
+ **/
+public class JpaPageHelper {
+ protected static int pageNum=0;
+ protected static int pageSize=0;
+ public static void startPage(int pageNum, int pageSize) {
+ JpaPageHelper.pageNum = pageNum;
+ JpaPageHelper.pageSize = pageSize;
+ }
+
+}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageInfo.java b/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageInfo.java
new file mode 100644
index 0000000..eb5a424
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/utils/pagehelper/JpaPageInfo.java
@@ -0,0 +1,137 @@
+package com.ruoyi.utils.pagehelper;
+
+import java.util.List;
+/**
+ * @Description:
+ * @ClassName: JpaPageInfo
+ * @Author: 鍒樿嫃涔�
+ * @Date: 2023骞�07鏈�31鏃�10:42:40
+ * @Version: 1.0
+ **/
+public class JpaPageInfo {
+ private int totalPage;
+ private int pageSize;
+ private int pageNum;
+ private int total;
+ private boolean isFirstPage;
+ private boolean isLastPage;
+ private boolean hasPreviousPage;
+ private boolean hasNextPage;
+ private List<?> list;
+
+ public JpaPageInfo() {
+
+ }
+
+ public JpaPageInfo(List list) {
+ this.pageNum = JpaPageHelper.pageNum;
+ this.pageSize = JpaPageHelper.pageSize;
+ this.doPage(list);
+ JpaPageHelper.pageNum = 0;
+ JpaPageHelper.pageSize = 0;
+ }
+
+ public void doPage(List list) {
+ if (this.pageSize == 0) {
+ this.pageSize = 10;
+ }
+ this.total = list.size();
+
+ this.totalPage = list.size() / this.pageSize;
+ if (list.size() % this.pageSize != 0) {
+ this.totalPage++;
+ }
+ if (this.pageNum * this.pageSize > list.size()) {
+ this.pageNum = this.totalPage;
+ }
+ if (this.pageNum <= 0) {
+ this.pageNum = 1;
+ }
+ int fromIndex = (pageNum - 1) * this.pageSize;
+ int toIndex = pageNum * pageSize;
+ this.isFirstPage = fromIndex == 0;
+ this.hasPreviousPage = !this.isFirstPage;
+ this.isLastPage = toIndex >= list.size();
+ if (this.isLastPage) {
+ toIndex = list.size();
+ }
+ this.hasNextPage = !this.isLastPage;
+
+ this.list = list.subList(fromIndex, toIndex);
+
+ }
+
+ public int getTotalPage() {
+ return totalPage;
+ }
+
+ public void setTotalPage(int totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public int getPageNum() {
+ return pageNum;
+ }
+
+ public void setPageNum(int pageNum) {
+ this.pageNum = pageNum;
+ }
+
+ public int getTotal() {
+ return total;
+ }
+
+ public void setTotal(int total) {
+ this.total = total;
+ }
+
+ public boolean isFirstPage() {
+ return isFirstPage;
+ }
+
+ public void setFirstPage(boolean firstPage) {
+ isFirstPage = firstPage;
+ }
+
+ public boolean isLastPage() {
+ return isLastPage;
+ }
+
+ public void setLastPage(boolean lastPage) {
+ isLastPage = lastPage;
+ }
+
+ public boolean isHasPreviousPage() {
+ return hasPreviousPage;
+ }
+
+ public void setHasPreviousPage(boolean hasPreviousPage) {
+ this.hasPreviousPage = hasPreviousPage;
+ }
+
+ public boolean isHasNextPage() {
+ return hasNextPage;
+ }
+
+ public void setHasNextPage(boolean hasNextPage) {
+ this.hasNextPage = hasNextPage;
+ }
+
+ public List<?> getList() {
+ return list;
+ }
+
+ public void setList(List<?> list) {
+ this.list = list;
+ }
+}
+
+
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 2352dcd..c4c8c84 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -131,8 +131,6 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
and a.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
</if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
</where>
order by a.create_time desc
</select>
--
Gitblit v1.9.3