Parcourir la source

Merge branch 'develop' of gitadmin/tuoheng_lc into release

tags/v1.2.0^2
wanjing il y a 1 an
Parent
révision
3d928175b8
1 fichiers modifiés avec 3 ajouts et 2 suppressions
  1. +3
    -2
      tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java

+ 3
- 2
tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/QuestionServiceImpl.java Voir le fichier

@@ -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) {

Chargement…
Annuler
Enregistrer