Browse Source

BUG修复

wangliang 3 years ago
parent
commit
2ca7f3c93a

+ 2 - 7
themis-admin/src/main/java/com/qmth/themis/admin/api/TIeInvigilateController.java

@@ -70,15 +70,9 @@ public class TIeInvigilateController {
     @Resource
     @Resource
     TIeInvigilateWarnInfoService tIeInvigilateWarnInfoService;
     TIeInvigilateWarnInfoService tIeInvigilateWarnInfoService;
 
 
-    @Resource
-    TIeInvigilateExceptionInfoService tIeInvigilateExceptionInfoService;
-
     @Resource
     @Resource
     TEExamStudentLogService teExamStudentLogService;
     TEExamStudentLogService teExamStudentLogService;
 
 
-    @Resource
-    TBExamInvigilateUserService tbExamInvigilateUserService;
-
     @Resource
     @Resource
     TEExamActivityService teExamActivityService;
     TEExamActivityService teExamActivityService;
 
 
@@ -299,7 +293,8 @@ public class TIeInvigilateController {
         teExamStudentLogQueryWrapper.lambda().eq(TEExamStudentLog::getExamStudentId, examStudentId)
         teExamStudentLogQueryWrapper.lambda().eq(TEExamStudentLog::getExamStudentId, examStudentId)
                 .eq(TEExamStudentLog::getExamRecordId, examRecordId)
                 .eq(TEExamStudentLog::getExamRecordId, examRecordId)
                 .ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_HANDLE.name())
                 .ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_HANDLE.name())
-                .ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_REVOKE.name());
+                .ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_REVOKE.name())
+                .orderByAsc(TEExamStudentLog::getCreateTime);
 //                .and(w -> w.ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_HANDLE.name()).or().ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_REVOKE.name()));
 //                .and(w -> w.ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_HANDLE.name()).or().ne(TEExamStudentLog::getType, SystemOperationEnum.BREACH_REVOKE.name()));
         List<TEExamStudentLog> teExamStudentLogList = teExamStudentLogService.list(teExamStudentLogQueryWrapper);
         List<TEExamStudentLog> teExamStudentLogList = teExamStudentLogService.list(teExamStudentLogQueryWrapper);
         invigilateListDetailBean.setExamStudentLogList(teExamStudentLogList);
         invigilateListDetailBean.setExamStudentLogList(teExamStudentLogList);