Update TaskServiceImpl.java
This commit is contained in:
@@ -159,9 +159,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
|
||||
List<TaskDto> taskList = new ArrayList();
|
||||
|
||||
synchronized (TaskServiceImpl.class) {
|
||||
Iterator<TaskDto> 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<TaskDto> 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();
|
||||
|
||||
Reference in New Issue
Block a user