bugfix

themis-business/src/main/java/com/qmth/themis/business/constant/SystemConstant.java

@@ -15,6 +15,7 @@ import com.qmth.themis.common.enums.ExceptionResultEnum;
 import com.qmth.themis.common.enums.Platform;
 import com.qmth.themis.common.enums.Source;
 import com.qmth.themis.common.exception.BusinessException;
+import org.checkerframework.checker.units.qual.A;
 
 import java.io.File;
 import java.security.NoSuchAlgorithmException;
@@ -31,6 +32,8 @@ import java.util.stream.Collectors;
  */
 public class SystemConstant {
 
+    public static final String PATTERN = "^[A-Za-z0-9]*";
+
     /**
      * 鉴权
      */

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

@@ -944,6 +944,7 @@ public class TOeExamRecordServiceImpl extends ServiceImpl<TOeExamRecordMapper, T
      * @param orgId
      * @return
      */
+    @Override
     public List<InvigilateListHistoryBean> invigilatePageListHistoryExport(Long examId,
                                                                            Long examActivityId,
                                                                            String roomCode,

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

@@ -3,6 +3,7 @@ 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;
@@ -92,7 +93,7 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
                                 } else if (examStudentImportDto.getPassword().trim().length() < 6) {
                                     excelErrorList.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[密码]长度不能小于6位"));
                                 } else {
-                                    Pattern pattern = Pattern.compile("^[A-Za-z0-9]*");
+                                    Pattern pattern = Pattern.compile(SystemConstant.PATTERN);
                                     Matcher matcher = pattern.matcher(examStudentImportDto.getPassword().trim());
                                     if (!matcher.matches()) {
                                         excelErrorList.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[密码]不能包含特殊字符，只能为字母和数字"));

themis-business/src/main/java/com/qmth/themis/business/util/ExcelUtil.java

@@ -189,6 +189,8 @@ public class ExcelUtil {
                 return cell.getBooleanCellValue();
             case ERROR:
                 return cell.getErrorCellValue();
+            default:
+                break;
         }
         return null;
     }