考务接口修改

themis-business/src/main/java/com/qmth/themis/business/enums/AttachmentEnum.java

@@ -11,30 +11,33 @@ import java.util.Objects;
  */
 public enum AttachmentEnum {
 
-    name("姓名"),
+    name("姓名", true),
 
-    identity("证件号"),
+    identity("证件号", true),
 
-    courseCode("科目代码"),
+    courseCode("科目代码", true),
 
-    courseName("科目名称"),
+    courseName("科目名称", true),
 
-    grade("年级"),
+    grade("年级", false),
 
-    classNo("教学班级"),
+    classNo("教学班级", false),
 
-    examActivityCode("场次"),
+    examActivityCode("场次", false),
 
-    roomCode("考场代码"),
+    roomCode("考场代码", false),
 
-    roomName("考场名称"),
+    roomName("考场名称", false),
 
-    extendColumn("扩展字段");
+    extendColumn("扩展字段", false);
 
     private String code;
 
-    private AttachmentEnum(String code) {
+    private boolean required;
+
+    private AttachmentEnum(String code, boolean required) {
         this.code = code;
+        this.required = required;
     }
 
     /**
@@ -97,7 +100,41 @@ public enum AttachmentEnum {
         }
     }
 
+    /**
+     * 状态转换 toCode
+     *
+     * @param value
+     * @return
+     */
+    public static boolean convertToRequired(String value) {
+        if (Objects.equals(value.trim(), name.name())) {
+            return name.required;
+        } else if (Objects.equals(value.trim(), courseCode.name())) {
+            return courseCode.required;
+        } else if (Objects.equals(value.trim(), courseName.name())) {
+            return courseName.required;
+        } else if (Objects.equals(value.trim(), extendColumn.name())) {
+            return extendColumn.required;
+        } else if (Objects.equals(value.trim(), grade.name())) {
+            return grade.required;
+        } else if (Objects.equals(value.trim(), classNo.name())) {
+            return classNo.required;
+        } else if (Objects.equals(value.trim(), examActivityCode.name())) {
+            return examActivityCode.required;
+        } else if (Objects.equals(value.trim(), roomCode.name())) {
+            return roomCode.required;
+        } else if (Objects.equals(value.trim(), roomName.name())) {
+            return roomName.required;
+        } else {
+            return identity.required;
+        }
+    }
+
     public String getCode() {
         return code;
     }
+
+    public boolean isRequired() {
+        return required;
+    }
 }

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

@@ -163,7 +163,7 @@ public class ExcelUtil {
         for (int i = 0; i < fields.length; i++) {
             Field field = fields[i];
             field.setAccessible(true);
-            if (Objects.isNull(field.get(obj))) {
+            if (Objects.isNull(field.get(obj)) && AttachmentEnum.convertToRequired(field.getName())) {
                 excelErrorList.add(new ExcelError(index + 1, "excel第" + (sheetIndex + 1) + "个sheet第" + (index + 1) + "行，第" + (i + 1) + "列" + AttachmentEnum.convertToCode(field.getName()) + "为空"));
             }
         }