From 864ad2599ddd7b77d894fbe4d0bd9030b6ccf8ab Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Sun, 11 Dec 2022 21:59:45 +0800
Subject: [PATCH] 1

---
 .../jlw/service/TeacherOpenCourseHandsOnService.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
index 5c2b7aa7..4be1b078 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
@@ -349,7 +349,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         if (CollectionUtils.isNotEmpty(videoList)) {
                             StudentHandsOnTaskVideo studentHandsOnTaskVideo = videoList.get(0);
                             BigDecimal videoScore = studentHandsOnTaskVideo.getVideoScore();
-                            bigDecimal = bigDecimal.add(videoScore);
+                            bigDecimal = bigDecimal.add(videoScore == null ? BigDecimal.ZERO:videoScore);
                             decimal = decimal.add(BigDecimal.ONE);
                         }
                     }else if("2".equals(task.getTaskType())) {
@@ -360,7 +360,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         if (CollectionUtils.isNotEmpty(pptList)) {
                             StudentHandsOnTaskPpt studentHandsOnTaskPpt = pptList.get(0);
                             BigDecimal videoScore = studentHandsOnTaskPpt.getPptScore();
-                            bigDecimal = bigDecimal.add(videoScore);
+                            bigDecimal = bigDecimal.add(videoScore == null ? BigDecimal.ZERO: videoScore);
                             decimal = decimal.add(BigDecimal.ONE);
                         }
                     }else if("3".equals(task.getTaskType())) {
@@ -370,7 +370,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         List<StudentHandsOnTaskTheory> taskTheoryList = theoryService.getValuesByQueryNotWithPermission(theoryQuery);
                         if (CollectionUtils.isNotEmpty(taskTheoryList)) {
                             BigDecimal videoScore = taskTheoryList.stream().map(StudentHandsOnTaskTheory::getTheoryScore).reduce(BigDecimal.ZERO, BigDecimal::add);
-                            bigDecimal = bigDecimal.add(videoScore);
+                            bigDecimal = bigDecimal.add(videoScore  == null ? BigDecimal.ZERO: videoScore);
                             decimal = decimal.add(BigDecimal.ONE);
                         }
                     }else if("4".equals(task.getTaskType())) {
@@ -381,7 +381,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         if (CollectionUtils.isNotEmpty(stepList)) {
                             StudentHandsOnTaskStep taskTheory = stepList.get(0);
                             BigDecimal videoScore = taskTheory.getTheoryScore();
-                            bigDecimal = bigDecimal.add(videoScore);
+                            bigDecimal = bigDecimal.add(videoScore == null ? BigDecimal.ZERO: videoScore);
                             decimal = decimal.add(BigDecimal.ONE);
                         }
                     }else if("5".equals(task.getTaskType())) {
@@ -392,7 +392,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
                         if (CollectionUtils.isNotEmpty(reportList)) {
                             StudentHandsOnTaskReport taskTheory = reportList.get(0);
                             BigDecimal videoScore = taskTheory.getReportScore();
-                            bigDecimal = bigDecimal.add(videoScore);
+                            bigDecimal = bigDecimal.add(videoScore == null ? BigDecimal.ZERO: videoScore);
                             decimal = decimal.add(BigDecimal.ONE);
                         }
                     }