ting.yin před 3 roky
rodič
revize
505f548165

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

@@ -73,7 +73,8 @@ public class SubjectQuestionDTO {
                     groups.put(question.getGroupNumber(), group);
                     groups.put(question.getGroupNumber(), group);
                 }
                 }
                 group.getImportQuestionList().add(question);
                 group.getImportQuestionList().add(question);
-                this.trialCount = question.getTrialCount() == null ? 0 : question.getTrialCount();
+                this.trialCount = question.getTrialCount() != null && question.getTrialCount() > 0 ? question
+                        .getTrialCount() : 0;
                 // group.setTotalScore(group.getTotalScore() +
                 // group.setTotalScore(group.getTotalScore() +
                 // question.getTotalScore());
                 // question.getTotalScore());
                 // totalScore += question.getTotalScore();
                 // totalScore += question.getTotalScore();

+ 1 - 1
stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java

@@ -51,7 +51,7 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
     @ExcelField(title = "评卷模式(common-普通,track-轨迹)", align = 2, sort = 130)
     @ExcelField(title = "评卷模式(common-普通,track-轨迹)", align = 2, sort = 130)
     private String markMode;
     private String markMode;
 
 
-    @ExcelField(title = "试评数量(0-跳过试评)*", align = 2, sort = 140)
+    @ExcelField(title = "试评数量(0-跳过试评)", align = 2, sort = 140)
     private Integer trialCount;
     private Integer trialCount;
 
 
     @ExcelField(title = "选做题数量", align = 2, sort = 150)
     @ExcelField(title = "选做题数量", align = 2, sort = 150)