|
@@ -312,7 +312,7 @@ public class SubjectQuestionDTO {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
//开启双评
|
|
//开启双评
|
|
- if(question.getArbitrateThreshold()!=null && question.getArbitrateThreshold()>0){
|
|
|
|
|
|
+ if(question.getDoubleRate()!=null && question.getDoubleRate()>0){
|
|
//判断分组方式是否一致
|
|
//判断分组方式是否一致
|
|
Map<Integer,Set<Integer>> groupArbitrateTypeMap= arbitrateTypeMap.get(question.getSubjectCode());
|
|
Map<Integer,Set<Integer>> groupArbitrateTypeMap= arbitrateTypeMap.get(question.getSubjectCode());
|
|
if(groupArbitrateTypeMap ==null){
|
|
if(groupArbitrateTypeMap ==null){
|
|
@@ -330,7 +330,7 @@ public class SubjectQuestionDTO {
|
|
groupArbitrateTypeMap.put(question.getGroupNumber(),arbitrateTypeSet);
|
|
groupArbitrateTypeMap.put(question.getGroupNumber(),arbitrateTypeSet);
|
|
arbitrateTypeMap.put(question.getSubjectCode(),groupArbitrateTypeMap);
|
|
arbitrateTypeMap.put(question.getSubjectCode(),groupArbitrateTypeMap);
|
|
|
|
|
|
- if(1==question.getArbitrateType() && question.getArbitrateThreshold()==null ){
|
|
|
|
|
|
+ if(1==question.getArbitrateType() && (question.getArbitrateThreshold()==null || question.getArbitrateThreshold()<=0)){
|
|
error.add("[" + subjectCode + "] 分组号" + question.getGroupNumber() + " 仲裁阈值为空");
|
|
error.add("[" + subjectCode + "] 分组号" + question.getGroupNumber() + " 仲裁阈值为空");
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|