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