wangliang преди 11 месеца
родител
ревизия
47cbb592c0

+ 4 - 1
distributed-print/src/main/java/com/qmth/distributed/print/api/obe/TRBasicInfoController.java

@@ -146,7 +146,10 @@ public class TRBasicInfoController {
             ReportCourseEvaluationResultDto reportCourseEvaluationResultDto = Objects.nonNull(trBasicInfo.getCourseEvaluationResult()) ?
                     JSONObject.parseObject(trBasicInfo.getCourseEvaluationResult(), ReportCourseEvaluationResultDto.class) :
                     null;
-            if (Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
+            if (Objects.nonNull(reportCourseEvaluationResultDto)
+                    && Objects.nonNull(reportCourseEvaluationResultDto.getWeightSettingSign())
+                    && Objects.nonNull(obeCourseWeightResult)
+                    && Objects.nonNull(obeCourseWeightResult.getWeightSettingSign())
                     && reportCourseEvaluationResultDto.getWeightSettingSign().longValue() != obeCourseWeightResult.getWeightSettingSign().longValue()) {
                 trBasicInfoService.clearReportData(cultureProgramId, courseId, paperNumber,
                         Objects.nonNull(tcPaperStruct.getDimensionSign())

+ 1 - 1
teachcloud-obe/src/main/java/com/qmth/teachcloud/obe/service/impl/TRBasicInfoServiceImpl.java

@@ -1327,7 +1327,7 @@ public class TRBasicInfoServiceImpl extends ServiceImpl<TRBasicInfoMapper, TRBas
         int count = tcFinalScoreService.getCountByScoreRange(examId, courseCode, paperNumber, cultureProgramId, courseId, start, end);
         Double rate = null;
         if (toltal != 0) {
-            rate = new BigDecimal(count).divide(new BigDecimal(toltal), 4, BigDecimal.ROUND_HALF_UP).setScale(2, BigDecimal.ROUND_HALF_UP).multiply(SystemConstant.PERCENT).doubleValue();
+            rate = new BigDecimal(count).divide(new BigDecimal(toltal), 4, BigDecimal.ROUND_HALF_UP).multiply(SystemConstant.PERCENT).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         }
         return new ScoreRangeVo(count, start, end, rate);
     }