|
@@ -177,7 +177,8 @@ public class TaskGroupController {
|
|
|
int totalManDay = 0;
|
|
|
List<Integer> groupIds = groupList.stream().map(TaskGroup::getId).collect(Collectors.toList());
|
|
|
List<Integer> projectIds = groupList.stream().map(TaskGroup::getProjectId).collect(Collectors.toList());
|
|
|
- List<Project> projectList = projectMapper.selectList(new LambdaQueryWrapper<Project>().select(Project::getCategory).isNotNull(Project::getCategory));
|
|
|
+ projectIds.add(-1);
|
|
|
+ List<Project> projectList = projectMapper.selectList(new LambdaQueryWrapper<Project>().in(Project::getId,projectIds).isNotNull(Project::getCategory));
|
|
|
List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().select(Task::getPlanHours,Task::getGroupId).isNotNull(Task::getPlanHours).in(Task::getGroupId, groupIds));
|
|
|
for (TaskGroup taskGroup : groupList) {
|
|
|
TaskGroup item = new TaskGroup();
|