xiaofei 2 лет назад
Родитель
Сommit
715ee80654

+ 2 - 2
src/main/java/com/qmth/eds/service/impl/WhuDataSyncServiceImpl.java

@@ -361,7 +361,7 @@ public class WhuDataSyncServiceImpl implements WhuDataSyncService {
      */
     private void calcProgress(ExamAssign examAssign, Double value, Double rebuildValue, List<ExamSyncStudentDto> examSyncStudentDtoList, Double maxTotalScore, List<ExamSyncStudentDto> finalList) {
         // 开启原始分四舍五入,先将分数四舍五入后再进行赋分计算
-        if (examAssign.getOpenTotalScoreRound()) {
+        if (examAssign.getOpenTotalScoreRound() != null && examAssign.getOpenTotalScoreRound()) {
             value = new BigDecimal(value).setScale(0, RoundingMode.HALF_UP).doubleValue();
         }
         // 公式1(赋值分=卷面成绩+ (100- 卷面成绩)/赋分系数)
@@ -481,7 +481,7 @@ public class WhuDataSyncServiceImpl implements WhuDataSyncService {
     private String roundOff59(String value, Boolean openRound) {
         // 分数>59,进1为60
         int intValue = new BigDecimal(value).setScale(0, RoundingMode.FLOOR).intValue();
-        if (openRound && intValue == 59) {
+        if (openRound != null && openRound && intValue == 59) {
             return "60";
         } else {
             return value;