分组导入校验

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectQuestionDTO.java

@@ -336,7 +336,7 @@ public class SubjectQuestionDTO {
                 error.add(errMsg(question.getGroupNumber(), "评卷模式不一致"));
                 return false;
             }
-            // 开启双评
+            // 双评比例校验
             Set<Double> doubleRateSet = doubleRateMap.get(question.getGroupNumber());
             if (doubleRateSet == null) {
                 doubleRateSet = new HashSet<>();
@@ -351,8 +351,17 @@ public class SubjectQuestionDTO {
             if (!doubleRateSet.isEmpty()) {
                 doubleRateFirst = doubleRateSet.iterator().next();
             }
+            // 开启双评
             if (doubleRateFirst != null && doubleRateFirst > 0) {
-                // 判断分组方式是否一致
+                if (question.getArbitrateType() == null) {
+                    error.add(errMsg(question.getGroupNumber(), "仲裁方式为空"));
+                    return false;
+                }
+                if (question.getArbitrateType() != 0 && question.getArbitrateType() != 1) {
+                    error.add(errMsg(question.getGroupNumber(), "仲裁方式值只能是0或1"));
+                    return false;
+                }
+                // 仲裁方式是否一致
                 Set<Integer> arbitrateTypeSet = arbitrateTypeMap.get(question.getGroupNumber());
                 if (arbitrateTypeSet == null) {
                     arbitrateTypeSet = new HashSet<>();
@@ -385,7 +394,16 @@ public class SubjectQuestionDTO {
                     return false;
                 }
 
-                // 评分规则一致
+                // 合分策略一致
+                if (question.getScorePolicy() == null) {
+                    error.add(errMsg(question.getGroupNumber(), "合分策略为空"));
+                    return false;
+                }
+                if (question.getScorePolicy() != 1 && question.getScorePolicy() != 2
+                        && question.getScorePolicy() != 3) {
+                    error.add(errMsg(question.getGroupNumber(), "合分策略值只能是1、2、3"));
+                    return false;
+                }
                 Set<Integer> policySet = policyMap.get(question.getGroupNumber());
                 if (policySet == null) {
                     policySet = new HashSet<>();