修复BUG

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

@@ -3,7 +3,6 @@ package com.qmth.themis.business.templete.impl;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
-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;
@@ -90,6 +89,7 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
                                     }
                                 }
                             }
+                            excelErrorList.addAll(ExcelUtil.checkExcelField(examStudentImportDto, y, i));
                             if (Objects.nonNull(examStudentImportDto.getPassword()) && !Objects.equals(examStudentImportDto.getPassword().trim(), "")) {
                                 if (examStudentImportDto.getPassword().trim().length() > 8) {
                                     excelErrorList.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[密码]长度不能大于8位"));

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.dto.ExamStudentImportDto;
 import com.qmth.themis.business.dto.RoomCodeImportDto;
 import com.qmth.themis.business.enums.TaskStatusEnum;
 import com.qmth.themis.business.templete.TaskImportCommon;
@@ -65,6 +66,14 @@ public class TaskRoomCodeImportTemplete implements TaskImportTemplete {
                             excelErrorList.addAll(finalExcelErrorList.get(i).get(i));
                         }
                     }
+                    for (int i = 0; i < finalList.size(); i++) {
+                        LinkedMultiValueMap<Integer, Object> map = finalList.get(i);
+                        List<Object> examStudentImportDtoList = map.get(i);
+                        for (int y = 0; y < examStudentImportDtoList.size(); y++) {
+                            RoomCodeImportDto roomCodeImportDto = (RoomCodeImportDto) examStudentImportDtoList.get(y);
+                            excelErrorList.addAll(ExcelUtil.checkExcelField(roomCodeImportDto, y, i));
+                        }
+                    }
                     if (excelErrorList.size() > 0) {
                         taskImportCommon.setException(true);
                         taskImportCommon.getTbTaskHistory().setFinishTime(System.currentTimeMillis());