考务导入接口

themis-business/src/main/java/com/qmth/themis/business/entity/TBExamInvigilateUser.java

@@ -43,8 +43,9 @@ public class TBExamInvigilateUser implements Serializable {
 
     }
 
-    public TBExamInvigilateUser(String roomCode, String roomName) {
+    public TBExamInvigilateUser(Long orgId, String roomCode, String roomName) {
         this.id = Constants.idGen.next();
+        this.orgId = orgId;
         this.roomCode = roomCode;
         this.roomName = roomName;
     }

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

@@ -174,12 +174,7 @@ public class TaskRoomCodeImportTemplete implements TaskImportTemplete {
             QueryWrapper<TBUser> tbUserQueryWrapper = new QueryWrapper<>();
             tbUserQueryWrapper.lambda().eq(TBUser::getLoginName, userName).eq(TBUser::getOrgId, orgId);
             TBUser tbUser = tbUserService.getOne(tbUserQueryWrapper);
-            if (Objects.nonNull(tbUser)) {
-                //新增考场
-                TBExamInvigilateUser tbExamInvigilateUser = new TBExamInvigilateUser(orgId, tbUser.getId(), roomCode, roomName);
-                tbExamInvigilateUserService.save(tbExamInvigilateUser);
-                tbExamInvigilateUserList.add(tbExamInvigilateUser);
-            } else {
+            if (Objects.isNull(tbUser)) {
                 //新增用户
                 tbUser = new TBUser(orgId, userName, userName, createId);
                 tbUserService.save(tbUser);
@@ -190,11 +185,25 @@ public class TaskRoomCodeImportTemplete implements TaskImportTemplete {
                 tbUserRoleService.save(tbUserRole);
                 tbUserRoleList.add(tbUserRole);
             }
+            //新增考场
+            QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
+            tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getRoomCode, roomCode).eq(TBExamInvigilateUser::getRoomName, roomName).eq(TBExamInvigilateUser::getOrgId, orgId).eq(TBExamInvigilateUser::getUserId, tbUser.getId());
+            TBExamInvigilateUser tbExamInvigilateUser = tbExamInvigilateUserService.getOne(tbExamInvigilateUserQueryWrapper);
+            if (Objects.isNull(tbExamInvigilateUser)) {
+                tbExamInvigilateUser = new TBExamInvigilateUser(orgId, tbUser.getId(), roomCode, roomName);
+                tbExamInvigilateUserService.save(tbExamInvigilateUser);
+                tbExamInvigilateUserList.add(tbExamInvigilateUser);
+            }
         } else {
             //新增考场
-            TBExamInvigilateUser tbExamInvigilateUser = new TBExamInvigilateUser(roomCode, roomName);
-            tbExamInvigilateUserService.save(tbExamInvigilateUser);
-            tbExamInvigilateUserList.add(tbExamInvigilateUser);
+            QueryWrapper<TBExamInvigilateUser> tbExamInvigilateUserQueryWrapper = new QueryWrapper<>();
+            tbExamInvigilateUserQueryWrapper.lambda().eq(TBExamInvigilateUser::getRoomCode, roomCode).eq(TBExamInvigilateUser::getRoomName, roomName).eq(TBExamInvigilateUser::getOrgId, orgId);
+            TBExamInvigilateUser tbExamInvigilateUser = tbExamInvigilateUserService.getOne(tbExamInvigilateUserQueryWrapper);
+            if (Objects.isNull(tbExamInvigilateUser)) {
+                tbExamInvigilateUser = new TBExamInvigilateUser(orgId, roomCode, roomName);
+                tbExamInvigilateUserService.save(tbExamInvigilateUser);
+                tbExamInvigilateUserList.add(tbExamInvigilateUser);
+            }
         }
     }
 }