luoweijian 20 hours ago
parent
commit
666f4c46df
  1. 8
      src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

8
src/main/java/com/project/task/domain/service/impl/SearchTaskDomainServiceImpl.java

@ -56,10 +56,14 @@ public class SearchTaskDomainServiceImpl implements SearchTaskDomainService {
private TaskDTO buildDTO(TaskEntity entity) {
TaskDTO dto = entity.toDTO(TaskDTO::new);
Date endOfToday = DateUtil.endOfDay(new Date());
Date beginOfToday = DateUtil.beginOfDay(new Date());
// 开始时间晚于当前
if (dto.getStartTime().after(new Date())) {
if (endOfToday.before(entity.getStartTime())) {
dto.setStatusText(TaskStatusEnum.Not_Start.getValue());
} else if (DateUtil.isIn(new Date() , dto.getStartTime() , dto.getEndTime())) {
} else if (DateUtil.isIn(new Date() , DateUtil.beginOfDay(dto.getStartTime())
, DateUtil.endOfDay(dto.getEndTime()))) {
dto.setStatusText(TaskStatusEnum.In_Progress.getValue());
} else {
dto.setStatusText(TaskStatusEnum.Cut_Off.getValue());

Loading…
Cancel
Save