diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java index 7adddb9f..8502aa58 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnList.java @@ -2,6 +2,8 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.entity.BaseEntity; +import java.util.List; + /** * 类功能说明 * @@ -43,6 +45,13 @@ public class TeacherOpenCourseHandsOnList extends BaseEntity { */ private Double reportAvgScore; + /** + * 章节id + */ + private Long courseChildNode; + + private List bindingKnowledgeIds; + public Long getHandsOnId() { return handsOnId; } @@ -98,4 +107,20 @@ public class TeacherOpenCourseHandsOnList extends BaseEntity { public void setReportAvgScore(Double reportAvgScore) { this.reportAvgScore = reportAvgScore; } + + public Long getCourseChildNode() { + return courseChildNode; + } + + public void setCourseChildNode(Long courseChildNode) { + this.courseChildNode = courseChildNode; + } + + public List getBindingKnowledgeIds() { + return bindingKnowledgeIds; + } + + public void setBindingKnowledgeIds(List bindingKnowledgeIds) { + this.bindingKnowledgeIds = bindingKnowledgeIds; + } } \ No newline at end of file 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 343c03da..4624b64e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -15,6 +15,7 @@ import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.TeacherOpenCourseHandsOnDao; +import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.vo.StudentHandsOnVO; import com.ibeetl.jlw.enums.CopyFromEnum; @@ -90,6 +91,9 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseServiceObjectUtil.defaultIfNull(e.getTheoryScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); Double stepAvgScore = collect.stream().map(e->ObjectUtil.defaultIfNull(e.getPracticalTrainingScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); Double reportAvgScore = collect.stream().map(e->ObjectUtil.defaultIfNull(e.getReportWritingScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); + //查询知识id + List select = teacherOpenCourseKnowledgePointDao.getSQLManager().lambdaQuery(TeacherOpenCourseKnowledgePoint.class) + .andEq(TeacherOpenCourseKnowledgePoint::getChapterId, teacherOpenCourseHandsOnList.getCourseChildNode()).select(); + List collect1 = select.stream().map(TeacherOpenCourseKnowledgePoint::getTeacherOpenCourseKnowledgePointId).collect(Collectors.toList()); teacherOpenCourseHandsOnList.setVideoAvgScore(videoScore); teacherOpenCourseHandsOnList.setPptAvgScore(pptAvgScore); teacherOpenCourseHandsOnList.setTheoryAvgScore(theoryAvgScore); teacherOpenCourseHandsOnList.setStepAvgScore(stepAvgScore); teacherOpenCourseHandsOnList.setReportAvgScore(reportAvgScore); + teacherOpenCourseHandsOnList.setBindingKnowledgeIds(collect1); } }