|
@@ -7,6 +7,7 @@ import com.qmth.themis.business.entity.TEExamActivity;
|
|
import com.qmth.themis.business.entity.TOeExamRecord;
|
|
import com.qmth.themis.business.entity.TOeExamRecord;
|
|
import com.qmth.themis.business.enums.ExamRecordStatusEnum;
|
|
import com.qmth.themis.business.enums.ExamRecordStatusEnum;
|
|
import com.qmth.themis.business.enums.FinishTypeEnum;
|
|
import com.qmth.themis.business.enums.FinishTypeEnum;
|
|
|
|
+import com.qmth.themis.business.enums.InvigilateMonitorStatusEnum;
|
|
import com.qmth.themis.business.service.*;
|
|
import com.qmth.themis.business.service.*;
|
|
import org.quartz.JobExecutionContext;
|
|
import org.quartz.JobExecutionContext;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
@@ -55,7 +56,8 @@ public class MqActivityJob extends QuartzJobBean {
|
|
Long finishTime = System.currentTimeMillis();
|
|
Long finishTime = System.currentTimeMillis();
|
|
QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
|
|
teExamQueryWrapper.lambda().eq(TEExam::getEnable, 1)
|
|
teExamQueryWrapper.lambda().eq(TEExam::getEnable, 1)
|
|
- .eq(TEExam::getForceFinish, 0)
|
|
|
|
|
|
+// .eq(TEExam::getForceFinish, 0)
|
|
|
|
+ .ne(TEExam::getMonitorStatus, InvigilateMonitorStatusEnum.FINISHED)
|
|
.le(TEExam::getEndTime, finishTime);
|
|
.le(TEExam::getEndTime, finishTime);
|
|
List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
|
|
List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
|
|
if (Objects.nonNull(teExamList) && teExamList.size() > 0) {
|
|
if (Objects.nonNull(teExamList) && teExamList.size() > 0) {
|