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 08a04d0a..1e4741ba 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -3,6 +3,7 @@ package com.ibeetl.jlw.service; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.EnumUtil; import cn.hutool.core.util.NumberUtil; @@ -92,10 +93,10 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService teacherOpenCourses = teacherOpenCourseService.getValues(teacherOpenCourse); + + if (CollectionUtil.isNotEmpty(teacherOpenCourses) && teacherOpenCourses.get(0).getEndTime().getTime() >= new Date().getTime()) { + Assert.isTrue(false, "课程在使用中"); + } + + try { + teacherOpenCourseHandsOnDao.deleteTeacherOpenCourseHandsOnByIds(ids); + } catch (Exception e) { + throw new PlatformException("批量删除教师开课-课程实操失败", e); + } + }else { + Assert.isTrue(false, "找不到课程实训"); + } + + } + public String addAll(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) { String msg = ""; List teacherOpenCourseHandsOnList = new ArrayList<>(); @@ -171,7 +207,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService collect = achievementList.stream().filter(v -> v.getHandOnId().equals(teacherOpenCourseHandsOnList.getHandsOnId())).collect(Collectors.toList()); - Double videoScore = collect.stream().map(e->ObjectUtil.defaultIfNull(e.getVideoScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - Double pptAvgScore = collect.stream().map(e->ObjectUtil.defaultIfNull(e.getPptScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - 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)); + Double videoScore = collect.stream().map(e -> ObjectUtil.defaultIfNull(e.getVideoScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double pptAvgScore = collect.stream().map(e -> ObjectUtil.defaultIfNull(e.getPptScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + 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 select = teacherOpenCourseKnowledgePointDao.getSQLManager().lambdaQuery(TeacherOpenCourseKnowledgePoint.class) .andEq(TeacherOpenCourseKnowledgePoint::getChapterId, teacherOpenCourseHandsOnList.getCourseChildNode()).select(); @@ -386,11 +422,11 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseServiceObjectUtil.defaultIfNull(e.getVideoScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - Double pptAvgScore = achievementList.stream().map(e->ObjectUtil.defaultIfNull(e.getPptScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - Double theoryAvgScore = achievementList.stream().map(e->ObjectUtil.defaultIfNull(e.getTheoryScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - Double stepAvgScore = achievementList.stream().map(e->ObjectUtil.defaultIfNull(e.getPracticalTrainingScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); - Double reportAvgScore = achievementList.stream().map(e->ObjectUtil.defaultIfNull(e.getReportWritingScore(),"0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double videoScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getVideoScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double pptAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getPptScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double theoryAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getTheoryScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double stepAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getPracticalTrainingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); + Double reportAvgScore = achievementList.stream().map(e -> ObjectUtil.defaultIfNull(e.getReportWritingScore(), "0")).collect(Collectors.averagingDouble(Double::parseDouble)); teacherOpenCourseHandsOnList.setVideoAvgScore(videoScore); teacherOpenCourseHandsOnList.setPptAvgScore(pptAvgScore); teacherOpenCourseHandsOnList.setTheoryAvgScore(theoryAvgScore); @@ -569,7 +605,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService courseInfoIdPair, - @Nullable Map resourcesQuestionIdPair - ) { - if (CollUtil.isEmpty(courseInfoIdPair)){ + @Nullable Map courseInfoIdPair, + @Nullable Map resourcesQuestionIdPair + ) { + if (CollUtil.isEmpty(courseInfoIdPair)) { return; } - if (resourcesQuestionIdPair==null){ + if (resourcesQuestionIdPair == null) { resourcesQuestionIdPair = new HashMap<>(); } Date now = new Date(); CoreUser currentUser = getUser(); - if (currentUser==null){ + if (currentUser == null) { throw new PlatformException("请先登录"); } TeacherOpenCourseHandsOnQuery handsOnQuery = new TeacherOpenCourseHandsOnQuery(); @@ -632,8 +667,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService handsOnSimulationTasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQuery(handsOnSimulationTasksQuery); - - Map simulationTaskOldToNewMap = new HashMap<>(); for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : handsOnSimulationTasksList) { Long newHandsOnId = handsOnIdOldToNewMap.get(teacherOpenCourseHandsOnSimulationTasks.getHandsOnId()); @@ -648,13 +681,13 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService newIdList = new ArrayList<>(); String[] split = teacherOpenCourseHandsOnSimulationTasks.getTaskList().split(","); for (String s : split) { Long oldQuestionId = Long.parseLong(s); Long newQuestionId = resourcesQuestionIdPair.get(oldQuestionId); - newIdList.add(newQuestionId!=null ? newQuestionId : oldQuestionId); + newIdList.add(newQuestionId != null ? newQuestionId : oldQuestionId); } String collect = newIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); teacherOpenCourseHandsOnSimulationTasks.setTaskList(collect); @@ -703,7 +736,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService courseInfoIdPair, @Nullable Map resourcesQuestionIdPair ) { - if (resourcesQuestionIdPair==null){ + if (resourcesQuestionIdPair == null) { resourcesQuestionIdPair = new HashMap<>(); } Date now = new Date(); CoreUser currentUser = getUser(); - if (currentUser==null){ + if (currentUser == null) { throw new PlatformException("请先登录"); } HandsOnQuery handsOnQuery = new HandsOnQuery(); @@ -747,7 +779,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService teacherOpenCourseHandsOnList = new ArrayList<>(BeanUtil.copyToList(handsOnList, TeacherOpenCourseHandsOn.class)); - Map handsOnIdOldToNewMap = new HashMap<>(); for (TeacherOpenCourseHandsOn teacherOpenCourseHandsOn : teacherOpenCourseHandsOnList) { @@ -783,7 +814,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService teacherOpenCourseHandsOnSimulationTasksList = new ArrayList<>(BeanUtil.copyToList(handsOnSimulationTasksList, TeacherOpenCourseHandsOnSimulationTasks.class)); - Map simulationTaskOldToNewMap = new HashMap<>(); Map finalResourcesQuestionIdPair = resourcesQuestionIdPair; @@ -806,14 +836,14 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService newIdList = new ArrayList<>(); String[] split = teacherOpenCourseHandsOnSimulationTasks.getTaskList().split(","); for (String s : split) { Long oldQuestionId = Long.parseLong(s); Long newQuestionId = finalResourcesQuestionIdPair.get(oldQuestionId); - newIdList.add(newQuestionId!=null ? newQuestionId : oldQuestionId); + newIdList.add(newQuestionId != null ? newQuestionId : oldQuestionId); } String collect = newIdList.stream().map(String::valueOf).collect(Collectors.joining(",")); teacherOpenCourseHandsOnSimulationTasks.setTaskList(collect); @@ -837,7 +867,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService