|
|
@@ -13,6 +13,7 @@ import com.tuoheng.admin.entity.request.index.GetAirportDetailDto; |
|
|
|
import com.tuoheng.admin.entity.request.index.GetQuestionListDto; |
|
|
|
import com.tuoheng.admin.entity.vo.MissionVO; |
|
|
|
import com.tuoheng.admin.enums.MarkTypeEnum; |
|
|
|
import com.tuoheng.admin.enums.TaskStatusEnum; |
|
|
|
import com.tuoheng.admin.mapper.QuestionMapper; |
|
|
|
import com.tuoheng.admin.mapper.ThMissionMapper; |
|
|
|
import com.tuoheng.admin.service.IndexService; |
|
|
@@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Objects; |
|
|
|
|
|
|
@@ -56,7 +58,7 @@ public class IndexServiceImpl implements IndexService { |
|
|
|
page.setCurrent(baseQuery.getPage() != null ? baseQuery.getPage() : 0); |
|
|
|
LambdaQueryWrapper<ThMission> queryMission=new LambdaQueryWrapper<>(); |
|
|
|
queryMission.eq(ThMission::getMark,MarkTypeEnum.VALID.getCode()).orderByDesc(ThMission::getCreateTime); |
|
|
|
|
|
|
|
queryMission.in(ThMission::getStatus, Arrays.asList(TaskStatusEnum.FLIGHT.getCode(),TaskStatusEnum.WAIT.getCode())); |
|
|
|
IPage<ThMission> thMissionIPage = thMissionMapper.selectPage(page, queryMission); |
|
|
|
List<ThMission> records = thMissionIPage.getRecords(); |
|
|
|
List<MissionVO> result=new ArrayList<>(); |