|
|
@@ -142,12 +142,15 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
|
|
|
@Override
|
|
|
public HttpRespMsg getListByCondition(TaskVO taskVO, PageUtil page) {
|
|
|
HttpRespMsg msg = new HttpRespMsg();
|
|
|
- PageHelper.startPage(page.getPageNum(), page.getPageSize());
|
|
|
if (taskVO.getType() == 0) {
|
|
|
//我的任务
|
|
|
List<Task> tasks = taskMapper.selectList(new QueryWrapper<Task>().eq("recipient_id", taskVO.getUid()));
|
|
|
+ for (Task task : tasks) {
|
|
|
+ System.out.println("----"+task.getId());
|
|
|
+ }
|
|
|
List<TaskParticipants> participants = taskParticipantsService.list(new QueryWrapper<TaskParticipants>().eq("user_id", taskVO.getUid()));
|
|
|
List<String> taskIds = new ArrayList<>();
|
|
|
+ taskIds.addAll(tasks.stream().map(Task::getId).collect(Collectors.toList()));
|
|
|
if (tasks.size() > 0) {
|
|
|
taskIds.addAll(tasks.stream().map(Task::getId).collect(Collectors.toList()));
|
|
|
}
|
|
|
@@ -155,12 +158,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
|
|
|
taskIds.addAll(participants.stream().map(TaskParticipants::getTaskId).collect(Collectors.toList()));
|
|
|
}
|
|
|
if (taskIds.size() > 0) {
|
|
|
+ PageHelper.startPage(page.getPageNum(), page.getPageSize());
|
|
|
List<TaskDTO> taskDTOList = taskMapper.selectListByTaskIds(taskIds, taskVO);
|
|
|
PageInfo<TaskDTO> pageInfo = new PageInfo<>(taskDTOList);
|
|
|
msg.data = pageInfo;
|
|
|
}
|
|
|
} else if (taskVO.getType() == 1) {
|
|
|
//我发布的
|
|
|
+ PageHelper.startPage(page.getPageNum(), page.getPageSize());
|
|
|
List<TaskDTO> taskDTOList = taskMapper.selectListByCondition(taskVO);
|
|
|
PageInfo<TaskDTO> pageInfo = new PageInfo<>(taskDTOList);
|
|
|
msg.data = pageInfo;
|