|
@@ -94,9 +94,15 @@ public class TIeInvigilateCallMobileController {
|
|
|
if (Objects.isNull(examId) || Objects.equals(examId, "")) {
|
|
|
throw new BusinessException(ExceptionResultEnum.EXAM_ID_IS_NULL);
|
|
|
}
|
|
|
+ List<String> callStatusList = new ArrayList<>();
|
|
|
if (Objects.nonNull(callStatus) && !Objects.equals(callStatus, "")) {
|
|
|
- MonitorCallStatusSourceEnum callStatusEnum = MonitorCallStatusSourceEnum.valueOf(callStatus);
|
|
|
- callStatus = callStatusEnum.name();
|
|
|
+ if (callStatus.contains(",")) {
|
|
|
+ String[] callStatusStrs = callStatus.split(",");
|
|
|
+ callStatusList = Arrays.asList(callStatusStrs);
|
|
|
+ } else {
|
|
|
+ MonitorCallStatusSourceEnum callStatusEnum = MonitorCallStatusSourceEnum.valueOf(callStatus);
|
|
|
+ callStatusList.add(callStatusEnum.name());
|
|
|
+ }
|
|
|
}
|
|
|
TBUser tbUser = (TBUser) ServletUtil.getRequestAccount();
|
|
|
AuthDto authDto = cacheService.addAccountAuthCache(tbUser.getId());
|
|
@@ -107,7 +113,7 @@ public class TIeInvigilateCallMobileController {
|
|
|
}
|
|
|
IPage<TIeExamInvigilateCallDto> tIeExamInvigilateCallIPage = tIeExamInvigilateCallService
|
|
|
.examInvigilateCallQuery(new Page<>(pageNumber, pageSize), examId, userId, tbUser.getOrgId(),
|
|
|
- MonitorStatusSourceEnum.START.name(), callStatus, roomCode);
|
|
|
+ MonitorStatusSourceEnum.START.name(), callStatusList, roomCode, callStatus);
|
|
|
tIeExamInvigilateCallIPage.getRecords().forEach(s -> {
|
|
|
s.setBasePhotoPath(
|
|
|
ossUtil.getAliYunOssPublicDomain().getPublicUrl() + File.separator + s.getBasePhotoPath());
|