Merge branch 'dev_v1.2.8' into release_v1.2.8

merge

themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamStudentController.java

@@ -321,6 +321,8 @@ public class TEExamStudentController {
         for (TEExamStudent es : teExamStudentList) {
             teExamStudentService.updateExamStudentCacheBean(es.getId());
             themisCacheService.updateTodayExamListCache(es.getExamId().toString(), es.getExamActivityId());
+            ExamCacheBean examCacheBean = teExamService.getExamCacheBean(es.getExamId());
+            themisCacheService.updateOrgExamListCache(examCacheBean.getOrgId().toString(), es.getExamId().toString(), es.getExamActivityId());
         }
         return ResultUtil.ok(true);
     }

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentImportTemplete.java

@@ -4,12 +4,13 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.reflect.TypeToken;
+import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.dto.ExamStudentImportDto;
 import com.qmth.themis.business.entity.TEExamActivity;
 import com.qmth.themis.business.enums.ExamModeEnum;
 import com.qmth.themis.business.enums.TaskStatusEnum;
-import com.qmth.themis.business.service.TEExamActivityService;
+import com.qmth.themis.business.service.TEExamService;
 import com.qmth.themis.business.service.ThemisCacheService;
 import com.qmth.themis.business.templete.TaskImportCommon;
 import com.qmth.themis.business.templete.TaskImportTemplete;
@@ -52,6 +53,9 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
     @Resource
     ThemisCacheService themisCacheService;
 
+    @Resource
+    TEExamService teExamService;
+
     /**
      * 考生导入模版
      *
@@ -139,6 +143,8 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
                 }.getType());
                 for (TEExamActivity t : teExamActivityList) {
                     themisCacheService.updateTodayExamListCache(String.valueOf(examId), t.getId());
+                    ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);
+                    themisCacheService.updateOrgExamListCache(examCacheBean.getOrgId().toString(), examId.toString(), t.getId());
                 }
                 long end = System.currentTimeMillis();
                 log.info("导入考生数据结束,============耗时============:{}秒", (end - start) / 1000);

themis-task/src/main/java/com/qmth/themis/task/quartz/ExamSummaryJob.java

@@ -58,7 +58,7 @@ public class ExamSummaryJob extends QuartzJobBean {
         Map<String, List<ExamListBean>> examListMap = redisUtil.getHashEntries(SystemConstant.TODAY_EXAM_LIST_MAP_CACHE);
         //获取当天考试列表
         if (!CollectionUtils.isEmpty(examListMap)) {
-            LinkedMultiValueMap<Long, Long> orgExamIdMap = new LinkedMultiValueMap<>();
+            LinkedMultiValueMap<Long, Long> orgExamIdMap = new LinkedMultiValueMap<>();//机构/考试批次id列表map
             for (Map.Entry<String, List<ExamListBean>> entry : examListMap.entrySet()) {
                 Long examId = Long.parseLong(entry.getKey());
                 ExamCacheBean examCacheBean = teExamService.getExamCacheBean(examId);