root/liXun_wms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update TaskServiceImpl.java

Browse Source
This commit is contained in:
张江玮
2023-11-22 13:12:52 +08:00
parent bd481d8bbf
commit 27ac015218
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -159,9 +159,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
List<TaskDto> taskList = new ArrayList(); List<TaskDto> taskList = new ArrayList();
synchronized (TaskServiceImpl.class) { synchronized (TaskServiceImpl.class) {
Iterator<TaskDto> it = tasks.iterator(); for (TaskDto task : tasks) {
while (it.hasNext()) {
TaskDto task = it.next();
if ("1".equals(is_over) && Integer.valueOf(task.getTask_status()) < 2) { if ("1".equals(is_over) && Integer.valueOf(task.getTask_status()) < 2) {
continue; continue;
} }
@@ -198,16 +196,16 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
(task1, task2) -> (task1, task2) ->
DateUtil.compare( DateUtil.compare(
DateUtil.parseDate(task1.getCreate_time()), DateUtil.parseDate(task1.getCreate_time()),
DateUtil.parse(task2.getCreate_time()))) DateUtil.parseDate(task2.getCreate_time())))
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
Integer currentPageNumber = page.getPageNumber() + 1; int currentPageNumber = page.getPageNumber() + 1;
Integer pageMaxSize = page.getPageSize(); int pageMaxSize = page.getPageSize();
List<TaskDto> taskDtoList = List<TaskDto> taskDtoList =
taskList.stream() taskList.stream()
.skip((currentPageNumber - 1) * pageMaxSize) .skip((long) (currentPageNumber - 1) * pageMaxSize)
.limit(pageMaxSize) .limit(pageMaxSize)
.collect(Collectors.toList()); .collect(Collectors.toList());
com.alibaba.fastjson.JSONObject jo = new com.alibaba.fastjson.JSONObject(); com.alibaba.fastjson.JSONObject jo = new com.alibaba.fastjson.JSONObject();