wangliang 3 лет назад
Родитель
Сommit
cfe491d022

+ 5 - 2
themis-task/src/main/java/com/qmth/themis/task/quartz/MqActivityJob.java

@@ -52,15 +52,18 @@ public class MqActivityJob extends QuartzJobBean {
     @Override
     protected void executeInternal(JobExecutionContext context) {
         log.info("mq_activity_job进来了,context:{}", context);
+        Long finishTime = System.currentTimeMillis();
         QueryWrapper<TEExam> teExamQueryWrapper = new QueryWrapper<>();
         teExamQueryWrapper.lambda().eq(TEExam::getEnable, 1)
-                .eq(TEExam::getForceFinish, 0);
+                .eq(TEExam::getForceFinish, 0)
+                .le(TEExam::getEndTime, finishTime);
         List<TEExam> teExamList = teExamService.list(teExamQueryWrapper);
         if (Objects.nonNull(teExamList) && teExamList.size() > 0) {
             for (TEExam exam : teExamList) {
                 QueryWrapper<TEExamActivity> teExamActivityQueryWrapper = new QueryWrapper<>();
                 teExamActivityQueryWrapper.lambda().eq(TEExamActivity::getEnable, 1)
-                        .eq(TEExamActivity::getExamId, exam.getId());
+                        .eq(TEExamActivity::getExamId, exam.getId())
+                        .le(TEExamActivity::getFinishTime, finishTime);
                 List<TEExamActivity> teExamActivityList = teExamActivityService.list(teExamActivityQueryWrapper);
                 if (Objects.nonNull(teExamActivityList) && teExamActivityList.size() > 0) {
                     Set<Long> examActivityIdSet = teExamActivityList.stream().map(s -> s.getId()).collect(Collectors.toSet());