|
|
|
@ -14,7 +14,6 @@ import com.project.task.domain.entity.TaskEntity; |
|
|
|
import com.project.task.domain.entity.TaskUserEntity; |
|
|
|
import com.project.task.domain.enums.CandidateExamResultEnum; |
|
|
|
import com.project.task.domain.enums.CandidateTaskStatusEnum; |
|
|
|
import com.project.task.domain.enums.TaskStatusEnum; |
|
|
|
import com.project.task.domain.enums.TaskUserStatusEnum; |
|
|
|
import com.project.task.domain.param.TaskParam; |
|
|
|
import com.project.task.domain.service.CandidateSearchTaskDomainService; |
|
|
|
@ -23,7 +22,6 @@ import com.project.task.mapper.TaskUserMapper; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Objects; |
|
|
|
@ -40,6 +38,12 @@ public class CandidateSearchTaskDomainServiceImpl implements CandidateSearchTask |
|
|
|
@Override |
|
|
|
public Result<PageResult<TaskDTO>> candidateSearch(TaskParam param) throws Exception { |
|
|
|
LambdaQueryWrapper<TaskEntity> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
|
|
|
|
queryWrapper.exists(String.format( |
|
|
|
"SELECT 1 FROM evaluator_task_user tu WHERE tu.task_id = evaluator_task.id AND tu.user_id = '%s'", |
|
|
|
SecurityUtils.getUserId() |
|
|
|
)); |
|
|
|
|
|
|
|
if (StrUtil.isNotBlank(param.getName())) { |
|
|
|
queryWrapper.like(TaskEntity::getName , param.getName()); |
|
|
|
} |
|
|
|
@ -92,7 +96,7 @@ public class CandidateSearchTaskDomainServiceImpl implements CandidateSearchTask |
|
|
|
queryWrapper.orderByDesc(TaskEntity::getStartTime); |
|
|
|
break; |
|
|
|
default: |
|
|
|
queryWrapper.orderByDesc(TaskEntity::getStartTime); // 默认排序
|
|
|
|
queryWrapper.orderByAsc(TaskEntity::getEndTime); // 默认排序
|
|
|
|
} |
|
|
|
} else { |
|
|
|
// 默认按开始时间倒序
|
|
|
|
@ -103,6 +107,13 @@ public class CandidateSearchTaskDomainServiceImpl implements CandidateSearchTask |
|
|
|
return Result.page(entityPage.convert(this::buildDTO)); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<TaskDTO> getCandidateDetail(Long id) throws Exception { |
|
|
|
TaskEntity taskEntity = taskMapper.selectById(id); |
|
|
|
return Result.success(buildDTO(taskEntity)); |
|
|
|
} |
|
|
|
|
|
|
|
private TaskDTO buildDTO(TaskEntity entity) { |
|
|
|
TaskDTO dto = entity.toDTO(TaskDTO::new); |
|
|
|
Date endOfToday = DateUtil.endOfDay(new Date()); |
|
|
|
|