Quellcode durchsuchen

Merge branch 'develop' of gitadmin/tuoheng_lc into release

tags/v1.2.0^2
wanjing vor 1 Jahr
Ursprung
Commit
3d928175b8
1 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  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 Datei anzeigen

@Override @Override
public List<Question> distributed(QuestionQuery query) { public List<Question> distributed(QuestionQuery query) {
List<ThMission> thMissions = missionMapper.selectList(new LambdaQueryWrapper<ThMission>() 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()) .eq(ThMission::getMark, MarkTypeEnum.VALID.getCode())
.in(ThMission::getStatus, Arrays.asList(TaskStatusEnum.FLIGHT.getCode(), TaskStatusEnum.FAIL.getCode(), TaskStatusEnum.COMPLETE.getCode())) .in(ThMission::getStatus, Arrays.asList(TaskStatusEnum.FLIGHT.getCode(), TaskStatusEnum.FAIL.getCode(), TaskStatusEnum.COMPLETE.getCode()))
.orderByDesc(ThMission::getUpdateTime)); .orderByDesc(ThMission::getUpdateTime));
return getQuestions(query, thMissions);
return this.getQuestions(query, thMissions);
} }


private List<Question> getQuestions(QuestionQuery query, List<ThMission> thMissions) { private List<Question> getQuestions(QuestionQuery query, List<ThMission> thMissions) {

Laden…
Abbrechen
Speichern