Merge branch 'dev'

111

themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -302,17 +302,25 @@ public class SysController {
         List<TEExamStudent> teExamStudentList = teExamStudentService.list(teExamStudentQueryWrapper);
         Set<Long> examActivityIdSet = null;
         List<TEExamActivity> teExamActivityList = null;
+        List<Map> courseList = null;
         if (Objects.nonNull(teExamStudentList) && teExamStudentList.size() > 0) {
             examActivityIdSet = new HashSet<>();
+            courseList = new ArrayList<>();
             Set<Long> finalExamActivityIdSet = examActivityIdSet;
+            List<Map> finalCourseList = courseList;
             teExamStudentList.forEach(s -> {
                 finalExamActivityIdSet.add(s.getExamActivityId());
+                Map map = new HashMap();
+                map.put("courseCode", s.getCourseCode());
+                map.put("courseName", s.getCourseName());
+                finalCourseList.add(map);
             });
             teExamActivityList = teExamActivityService.listByIds(examActivityIdSet);
         }
         Map map = new HashMap();
         map.put("examActivitys", teExamActivityList);
         map.put("examRooms", tbExamInvigilateUserList);
+        map.put("examCourses", courseList);
         return ResultUtil.ok(map);
     }
 }

themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -1,6 +1,5 @@
 package com.qmth.themis.backend.api;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,7 +19,10 @@ import com.qmth.themis.business.enums.MqTagEnum;
 import com.qmth.themis.business.enums.MqTopicEnum;
 import com.qmth.themis.business.enums.SystemOperationEnum;
 import com.qmth.themis.business.service.*;
-import com.qmth.themis.business.util.*;
+import com.qmth.themis.business.util.EhcacheUtil;
+import com.qmth.themis.business.util.RedisUtil;
+import com.qmth.themis.business.util.ServletUtil;
+import com.qmth.themis.business.util.SessionUtil;
 import com.qmth.themis.common.contanst.Constants;
 import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
@@ -198,6 +200,7 @@ public class TBUserController {
         map.put(SystemConstant.ACCESS_TOKEN, test);
         map.put(SystemConstant.ACCOUNT, user);
         map.put(SystemConstant.SESSION_ID, sessionId);
+        map.put("roleCodes", authDto.getRoleCodes());
         if (Objects.nonNull(authDto.getTbOrg())) {
             Map orgMap = new HashMap();
             orgMap.put("name", authDto.getTbOrg().getName());

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

@@ -134,7 +134,10 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     }
                     //先根据证件号+科目代码查询考生是否存在，存在则更新，不存在则插入
                     QueryWrapper<TEExamStudent> teExamStudentQueryWrapper = new QueryWrapper<>();
-                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity()).eq(TEExamStudent::getCourseCode, examStudentImportDto.getCourseCode());
+                    teExamStudentQueryWrapper.lambda().eq(TEExamStudent::getIdentity, examStudentImportDto.getIdentity())
+                            .eq(TEExamStudent::getCourseCode, examStudentImportDto.getCourseCode())
+                            .eq(TEExamStudent::getExamId, examId)
+                            .eq(TEExamStudent::getExamActivityId, teExamActivity.getId());
                     TEExamStudent teExamStudent = teExamStudentService.getOne(teExamStudentQueryWrapper);
                     //如果为空则插入考生数据，插入考生前先插入学生档案数据
                     if (Objects.isNull(teExamStudent)) {