From 746d7b34c0b13d20bf7de28a33af62d40b0e41b6 Mon Sep 17 00:00:00 2001
From: wgf <121463602@qq.com>
Date: Mon, 22 May 2023 17:52:31 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=9F=A5=E8=AF=86id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/TeacherOpenCourseHandsOnList.java  | 25 +++++++++++++++++++
 .../TeacherOpenCourseHandsOnService.java      |  9 +++++++
 2 files changed, 34 insertions(+)

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<Long> 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<Long> getBindingKnowledgeIds() {
+        return bindingKnowledgeIds;
+    }
+
+    public void setBindingKnowledgeIds(List<Long> 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 CoreBaseService<TeacherOpen
     @Autowired
     private  TeacherOpenCourseHandsOnSimulationTasksFileService teacherOpenCourseHandsOnSimulationTasksFileService;
 
+    @Autowired
+    private TeacherOpenCourseKnowledgePointDao teacherOpenCourseKnowledgePointDao;
+
     // 这里简单使用一个雪花算法，来生成新的ID
     private static final Snowflake snowflake = new Snowflake();
 
@@ -270,11 +274,16 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
             Double theoryAvgScore = collect.stream().map(e->ObjectUtil.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<TeacherOpenCourseKnowledgePoint> select = teacherOpenCourseKnowledgePointDao.getSQLManager().lambdaQuery(TeacherOpenCourseKnowledgePoint.class)
+                    .andEq(TeacherOpenCourseKnowledgePoint::getChapterId, teacherOpenCourseHandsOnList.getCourseChildNode()).select();
+            List<Long> 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);
         }
     }