|
@@ -17,7 +17,9 @@ import javax.servlet.http.HttpServletRequest;
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Optional;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -278,7 +280,11 @@ public class TaskController {
|
|
List<Task> list = taskService.list(queryWrapper);
|
|
List<Task> list = taskService.list(queryWrapper);
|
|
//设置列表名称
|
|
//设置列表名称
|
|
list.forEach(item->{
|
|
list.forEach(item->{
|
|
- item.setStagesName(stagesList.stream().filter(s->s.getId().equals(item.getStagesId())).findFirst().get().getStagesName());
|
|
|
|
|
|
+ Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(item.getStagesId())).findFirst();
|
|
|
|
+ if (first.isPresent()) {
|
|
|
|
+ item.setStagesName(first.get().getStagesName());
|
|
|
|
+ }
|
|
|
|
+
|
|
});
|
|
});
|
|
msg.data = list;
|
|
msg.data = list;
|
|
return msg;
|
|
return msg;
|