tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent 85b0c96243 864ad2599d
commit 33b9869a3b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java
Unescape Escape View File

@ -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);
}
}

Write Preview
Loading…
Cancel
Save