From 27ac015218f98ed38b03b5cf8e515d0ce8b15760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Wed, 22 Nov 2023 13:12:52 +0800 Subject: [PATCH] Update TaskServiceImpl.java --- .../nl/acs/task/service/impl/TaskServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 7663ceb..905a836 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -159,9 +159,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { List taskList = new ArrayList(); synchronized (TaskServiceImpl.class) { - Iterator it = tasks.iterator(); - while (it.hasNext()) { - TaskDto task = it.next(); + for (TaskDto task : tasks) { if ("1".equals(is_over) && Integer.valueOf(task.getTask_status()) < 2) { continue; } @@ -198,16 +196,16 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { (task1, task2) -> DateUtil.compare( DateUtil.parseDate(task1.getCreate_time()), - DateUtil.parse(task2.getCreate_time()))) + DateUtil.parseDate(task2.getCreate_time()))) .collect(Collectors.toList()); } - Integer currentPageNumber = page.getPageNumber() + 1; - Integer pageMaxSize = page.getPageSize(); + int currentPageNumber = page.getPageNumber() + 1; + int pageMaxSize = page.getPageSize(); List taskDtoList = taskList.stream() - .skip((currentPageNumber - 1) * pageMaxSize) + .skip((long) (currentPageNumber - 1) * pageMaxSize) .limit(pageMaxSize) .collect(Collectors.toList()); com.alibaba.fastjson.JSONObject jo = new com.alibaba.fastjson.JSONObject();