监考老师导入bug

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

@@ -228,6 +228,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         if (Objects.nonNull(map.get("orgId"))) {
             orgId = Long.parseLong(String.valueOf(map.get("orgId")));
         }
+        Long examId=Long.parseLong(String.valueOf(map.get("examId")));
         Long createId = Long.parseLong(String.valueOf(map.get("createId")));
         List<String> txtList = (List<String>) map.get("txtList");
         TBTaskHistory tbTaskHistory = (TBTaskHistory) map.get("tbTaskHistory");
@@ -246,9 +247,9 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                 List subList = examStudentDtoImportList.subList(min, max);
                 for (; y < subList.size(); y++) {
                     RoomCodeImportDto roomCodeImportDto = (RoomCodeImportDto) subList.get(y);
-                    dataVerify(roomCodeImportDto.getTeacher1(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
-                    dataVerify(roomCodeImportDto.getTeacher2(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
-                    dataVerify(roomCodeImportDto.getTeacher3(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
+                    dataVerify(examId,roomCodeImportDto.getTeacher1(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
+                    dataVerify(examId,roomCodeImportDto.getTeacher2(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
+                    dataVerify(examId,roomCodeImportDto.getTeacher3(), roomCodeImportDto.getRoomCode(), roomCodeImportDto.getRoomName(), orgId, createId);
                 }
                 txtList = this.importProgress(max, min, size, txtList, tbTaskHistory, timeFormat);
                 if (max == size) {
@@ -283,16 +284,15 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
         return map;
     }
 
-    /**
-     * 查询监考帐号是否存在
-     *
+    /**查询监考帐号是否存在
+     * @param examId
      * @param userName
      * @param roomCode
      * @param roomName
      * @param orgId
      * @param createId
      */
-    public void dataVerify(String userName, String roomCode, String roomName, Long orgId, Long createId) {
+    public void dataVerify(Long examId,String userName, String roomCode, String roomName, Long orgId, Long createId) {
         if (Objects.nonNull(userName)) {
             //先查询监考帐号是否存在
             QueryWrapper<TBUser> tbUserQueryWrapper = new QueryWrapper<>();
@@ -313,7 +313,7 @@ public class TempleteLogicServiceImpl implements TempleteLogicService {
                     .eq(TBExamInvigilateUser::getRoomName, roomName);
             TBExamInvigilateUser tbExamInvigilateUser = tbExamInvigilateUserService.getOne(tbExamInvigilateUserQueryWrapper);
             if (Objects.isNull(tbExamInvigilateUser)) {//新增考场
-                tbExamInvigilateUser = new TBExamInvigilateUser(orgId, tbUser.getId(), roomCode, roomName);
+                tbExamInvigilateUser = new TBExamInvigilateUser(examId,orgId, tbUser.getId(), roomCode, roomName);
             }
             tbExamInvigilateUserService.saveOrUpdate(tbExamInvigilateUser);
         }