|
|
@@ -126,11 +126,12 @@ public class QuestionServiceImpl extends BaseServiceImpl<QuestionMapper, Questio |
|
|
|
@Override |
|
|
|
public List<Question> distributed(QuestionQuery query) { |
|
|
|
List<ThMission> thMissions = missionMapper.selectList(new LambdaQueryWrapper<ThMission>() |
|
|
|
.eq(ThMission::getTenantId, ShiroUtils.getTenantId())//xz |
|
|
|
.eq(ThMission::getTenantId, ShiroUtils.getTenantId()) |
|
|
|
.eq(ThMission::getType, AccidentTaskEnum.INSPECTION_TASK.getCode()) |
|
|
|
.eq(ThMission::getMark, MarkTypeEnum.VALID.getCode()) |
|
|
|
.in(ThMission::getStatus, Arrays.asList(TaskStatusEnum.FLIGHT.getCode(), TaskStatusEnum.FAIL.getCode(), TaskStatusEnum.COMPLETE.getCode())) |
|
|
|
.orderByDesc(ThMission::getUpdateTime)); |
|
|
|
return getQuestions(query, thMissions); |
|
|
|
return this.getQuestions(query, thMissions); |
|
|
|
} |
|
|
|
|
|
|
|
private List<Question> getQuestions(QuestionQuery query, List<ThMission> thMissions) { |