修复新增，删除开课学生时，班级关联没有联动的bug，添加部分表新增是来源赋值

web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeStudentDao.java

@@ -45,4 +45,6 @@ public interface TeacherOpenCourseMergeStudentDao extends BaseMapper<TeacherOpen
      * @return
      */
     List<Student> randomStudentList(RandomStudentListDTO dto);
+
+    List<Long> getStudentClassIdList(Long teacherOpenCourseId);
 }

web/src/main/java/com/ibeetl/jlw/service/StatisticalAnalysisService.java

@@ -3,7 +3,6 @@ package com.ibeetl.jlw.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.NumberUtil;
-import com.alibaba.fastjson.JSON;
 import com.ibeetl.admin.core.dao.CoreUserDao;
 import com.ibeetl.admin.core.entity.CoreUser;
 import com.ibeetl.admin.core.util.enums.DelFlagEnum;
@@ -135,7 +134,7 @@ public class StatisticalAnalysisService {
             long count1 = scoreDashboards.stream().filter(v ->
                     "不及格".equals(v.getLastStatus()) || "E".equals(v.getLastStatus())).count();
             long l = scoreDashboards.size() - count1;
-            data.put("passRate", NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0));
+            data.put("passRate", studentList.size()==0?0:NumberUtil.formatPercent(NumberUtil.div(l, studentList.size()), 0));
             data.put("studentPassNum", l);
         } else {
             data.put("passRate", "0%");

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java

@@ -152,6 +152,8 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         String msg = "";
         TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnQuery.pojo();
         teacherOpenCourseHandsOn.setAddTime(new Date());
+        teacherOpenCourseHandsOn.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+        teacherOpenCourseHandsOn.setSourceFromId(-1L);
         teacherOpenCourseHandsOnDao.insert(teacherOpenCourseHandsOn);
         teacherOpenCourseHandsOnQuery.setHandsOnId(teacherOpenCourseHandsOn.getHandsOnId());
         JsonResult jsonResult = new JsonResult();

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java

@@ -20,6 +20,7 @@ import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
 import com.ibeetl.jlw.entity.vo.HandsOnTaskScoreVO;
 import com.ibeetl.jlw.entity.vo.StudentHandsOnScoreVO;
+import com.ibeetl.jlw.enums.CopyFromEnum;
 import com.ibeetl.jlw.enums.HandsOnTaskEnum;
 import com.ibeetl.jlw.web.query.*;
 import lombok.extern.slf4j.Slf4j;
@@ -155,9 +156,13 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
 
     public JsonResult add(TeacherOpenCourseHandsOnSimulationTasksQuery teacherOpenCourseHandsOnSimulationTasksQuery) {
 
+        Long userId = teacherOpenCourseHandsOnSimulationTasksQuery.getUserId();
+        Long orgId = teacherOpenCourseHandsOnSimulationTasksQuery.getOrgId();
         String msg = "";
         TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = teacherOpenCourseHandsOnSimulationTasksQuery.pojo();
         teacherOpenCourseHandsOnSimulationTasks.setAddTime(new Date());
+        teacherOpenCourseHandsOnSimulationTasks.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+        teacherOpenCourseHandsOnSimulationTasks.setSourceFromId(-1L);
         String handsOnTaskProblemVo = teacherOpenCourseHandsOnSimulationTasksQuery.getHandsOnTaskProblemVo();
         Long handsOnId = teacherOpenCourseHandsOnSimulationTasks.getHandsOnId();
         //分数
@@ -214,6 +219,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
 //                teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId());
                 teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnId(handsOnId);
                 teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setHandsOnTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
+                teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+                teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setSourceFromId(-1L);
+                teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setOrgId(orgId);
+                teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.setUserId(userId);
                 tasksAssessments.add(teacherOpenCourseHandsOnSimulationTasksAssessmentQuery.pojo());
             }
             if (CollectionUtil.isNotEmpty(tasksAssessments)) {
@@ -229,6 +238,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
                 teacherOpenCourseHandsOnSimulationTasksFile.setTeacherOpenCourseId(teacherOpenCourseHandsOnSimulationTasks.getTeacherOpenCourseId());
                 teacherOpenCourseHandsOnSimulationTasksFile.setHandsOnId(handsOnId);
                 teacherOpenCourseHandsOnSimulationTasksFile.setTaskId(teacherOpenCourseHandsOnSimulationTasks.getTaskId());
+                teacherOpenCourseHandsOnSimulationTasksFile.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+                teacherOpenCourseHandsOnSimulationTasksFile.setSourceFromId(-1L);
+                teacherOpenCourseHandsOnSimulationTasksFile.setOrgId(orgId);
+                teacherOpenCourseHandsOnSimulationTasksFile.setUserId(userId);
                 tasksFiles.add(teacherOpenCourseHandsOnSimulationTasksFile.pojo());
             }
             if (CollectionUtil.isNotEmpty(tasksFiles)) {

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java

@@ -249,6 +249,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
         BigDecimal bigDecimal = getFuncIncrement(paras, TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoOrder);
         teacherOpenCourseMergeCourseInfo.setTeacherOpenCourseMergeCourseInfoOrder(bigDecimal);
 
+        teacherOpenCourseMergeCourseInfo.setFromType(FROM_OPEN_COURSE);
+        teacherOpenCourseMergeCourseInfo.setSourceFromId(-1L);
+
         teacherOpenCourseMergeCourseInfoDao.insert(teacherOpenCourseMergeCourseInfo);
 
 //        teacherOpenCourseMergeCourseInfoService.invalidateCourseInfoTreeLocalCache(teacherOpenCourseMergeCourseInfo.getTeacherOpenCourseId());

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java

@@ -138,7 +138,8 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
     public JsonResult add(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery) {
         String msg = "";
         TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoQuery.pojo();
-
+        teacherOpenCourseMergeResourcesInfo.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+        teacherOpenCourseMergeResourcesInfo.setSourceFromId(-1L);
         // 获取新的排序值
         TeacherOpenCourseMergeResourcesInfo paras = new TeacherOpenCourseMergeResourcesInfo();
         paras.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId());

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java

@@ -167,6 +167,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
         String msg = "";
         TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion = teacherOpenCourseMergeResourcesQuestionQuery.pojo();
         teacherOpenCourseMergeResourcesQuestion.setFromType(CopyFromEnum.FROM_OPEN_COURSE);
+        teacherOpenCourseMergeResourcesQuestion.setSourceFromId(-1L);
         teacherOpenCourseMergeResourcesQuestionDao.insert(teacherOpenCourseMergeResourcesQuestion);
         teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseMergeResourcesQuestionId(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId());
         JsonResult jsonResult = new JsonResult();

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java

@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static com.ibeetl.admin.core.util.StreamUtils.listJoin;
@@ -90,7 +91,25 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
 
     public void deleteTeacherOpenCourseMergeStudent(String ids) {
         try {
+
+            List<TeacherOpenCourseMergeStudent> teacherOpenCourseMergeStudentList = teacherOpenCourseMergeStudentDao.getByIds(ids);
             teacherOpenCourseMergeStudentDao.deleteTeacherOpenCourseMergeStudentByIds(ids);
+            //删除以后要判断这个开课是否还有这个班级的学生，没有就把班级关联也给删了
+
+            List<Long> teacherOpenCourseIdList = teacherOpenCourseMergeStudentList.stream().map(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId).distinct().collect(Collectors.toList());
+
+            for (Long teacherOpenCourseId : teacherOpenCourseIdList) {
+                List<Long> classIdList = teacherOpenCourseMergeStudentDao.getStudentClassIdList(teacherOpenCourseId);
+                List<TeacherOpenCourseMergeSchoolClass> teacherOpenCourseMergeSchoolClassList = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
+                        .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId)
+                        .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1).select();
+                List<TeacherOpenCourseMergeSchoolClass> noExistClassList = teacherOpenCourseMergeSchoolClassList.stream().filter(e -> !classIdList.contains(e.getSchoolClassId())).collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(noExistClassList)) {
+                    String teacherOpenCourseMergeSchoolClassIds = noExistClassList.stream().filter(e -> e != null && e.getTeacherOpenCourseMergeSchoolClassId() != null).map(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassId).map(String::valueOf).collect(Collectors.joining(","));
+                    teacherOpenCourseMergeSchoolClassDao.deleteTeacherOpenCourseMergeSchoolClassByIds(teacherOpenCourseMergeSchoolClassIds);
+                }
+            }
+
         } catch (Exception e) {
             throw new PlatformException("批量删除开课关联学生失败", e);
         }
@@ -129,9 +148,46 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
                 OpenCourseMergeJoinTypeEnum joinType = teacherOpenCourseMergeStudent.getTeacherOpenCourseSchoolClassMergeStudentJoinType();
                 teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentJoinType(defaultIfNull(joinType, student_join));
                 teacherOpenCourseMergeStudent.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
+                teacherOpenCourseMergeStudent.setUserId(teacherOpenCourseMergeStudentQuery.getUserId());
             }
             insertBatch(teacherOpenCourseMergeStudentList);
+
+
+            //看下有没有班级关联，没有就加上
+            List<Long> teacherOpenCourseIdList = teacherOpenCourseMergeStudentList.stream().map(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId).distinct().collect(Collectors.toList());
+
+            for (Long teacherOpenCourseId : teacherOpenCourseIdList) {
+                //获取这个开课的现有的学生的所有班级
+                List<Long> allStudentClassIdList = teacherOpenCourseMergeStudentDao.getStudentClassIdList(teacherOpenCourseId);
+
+                //获取这个开课的所有班级关联
+                List<TeacherOpenCourseMergeSchoolClass> select = teacherOpenCourseMergeSchoolClassDao.createLambdaQuery()
+                        .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseId, teacherOpenCourseId)
+                        .andEq(TeacherOpenCourseMergeSchoolClass::getTeacherOpenCourseMergeSchoolClassStatus, 1)
+                        .select();
+
+                List<Long> existClassIdList = select.stream().map(TeacherOpenCourseMergeSchoolClass::getSchoolClassId).distinct().collect(Collectors.toList());
+
+
+                List<Long> notExistClassList = allStudentClassIdList.stream().filter(e -> !existClassIdList.contains(e)).collect(Collectors.toList());
+
+                for (Long classId : notExistClassList) {
+                    TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = new TeacherOpenCourseMergeSchoolClass();
+                    teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseId(teacherOpenCourseId);
+                    teacherOpenCourseMergeSchoolClass.setSchoolClassId(classId);
+                    teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassAddTime(new Date());
+                    teacherOpenCourseMergeSchoolClass.setTeacherOpenCourseMergeSchoolClassStatus(1);
+                    teacherOpenCourseMergeSchoolClass.setUserId(teacherOpenCourseMergeStudentQuery.getUserId());
+                    teacherOpenCourseMergeSchoolClass.setOrgId(teacherOpenCourseMergeStudentQuery.getOrgId());
+                    teacherOpenCourseMergeSchoolClassDao.insert(teacherOpenCourseMergeSchoolClass);
                 }
+
+            }
+        }
+
+
+
+
         return msg;
     }
 

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnSimulationTasksController.java

@@ -206,7 +206,6 @@ public class TeacherOpenCourseHandsOnSimulationTasksController{
      *
      *
      * @param teacherOpenCourseHandsOnSimulationTasksQuery
-     * @param teacherOpenCourseHandsOnSimulationTasksFile 附件
      * @param result
      * @param coreUser
      * @return

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java

@@ -58,9 +58,11 @@ public class TeacherOpenCourseMergeCourseInfoController{
     private static final String API = "/api/teacherOpenCourseMergeCourseInfo";
 
 
-    @Autowired private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
+    @Autowired
+    private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
 
-    @Autowired FileService fileService;
+    @Autowired
+    FileService fileService;
 
     /* 前端接口 */
 
@@ -180,7 +182,6 @@ public class TeacherOpenCourseMergeCourseInfoController{
         if (result.hasErrors()) {
             return JsonResult.failMessage(result);
         } else {
-            
             teacherOpenCourseMergeCourseInfoQuery.setUserId(coreUser.getId());
             teacherOpenCourseMergeCourseInfoQuery.setOrgId(coreUser.getOrgId());
             return teacherOpenCourseMergeCourseInfoService.addCourseAndQuestionWithQuestionSnap(teacherOpenCourseMergeCourseInfoQuery, null, new HashMap<>());
@@ -277,7 +278,8 @@ public class TeacherOpenCourseMergeCourseInfoController{
                 if (null != response && null != response.getOutputStream()) {
                     response.getOutputStream().close();
                 }
-                } catch (Exception e) { }
+            } catch (Exception e) {
+            }
         }
     }
 
@@ -442,14 +444,16 @@ public class TeacherOpenCourseMergeCourseInfoController{
                 if (null != response && null != response.getOutputStream()) {
                     response.getOutputStream().close();
                 }
-                } catch (Exception e) { }
+            } catch (Exception e) {
+            }
         }
     }
 
     /**
      * 教师端-导入课程章节操作，逻辑拆分
-     *
+     * <p>
      * 从系统章节库拉取章节到教师开课的课程章节中。
+     *
      * @param courseInfoIds       超管端的章节ID
      * @param teacherOpenCourseId 开课ID
      * @return
@@ -595,10 +599,10 @@ public class TeacherOpenCourseMergeCourseInfoController{
      * 只传左元素，表示：拖动元素 在 左元素的左侧；
      * 只传右元素，表示：拖动元素 在 右元素的右侧；
      * 左右元素都传，则拖动元素放置在两个元素的中间。
-     *
+     * <p>
      * 左侧（上） ==> 右侧（下）
      * 小数值    ==>  大数值
-     *
+     * <p>
      * 数值越小，越靠前
      *
      * @param id      拖动元素的ID

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java

@@ -65,9 +65,11 @@ public class TeacherOpenCourseMergeResourcesInfoController{
     private static final String API = "/api/teacherOpenCourseMergeResourcesInfo";
 
 
-    @Autowired private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
+    @Autowired
+    private TeacherOpenCourseMergeResourcesInfoService teacherOpenCourseMergeResourcesInfoService;
 
-    @Autowired FileService fileService;
+    @Autowired
+    FileService fileService;
 
     /* 前端接口 */
 
@@ -151,6 +153,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
     /**
      * 更改资源状态，上架下架啥删除.
      * 删除也可以单独调用 {@link #deleteDo}
+     *
      * @param ids
      * @param status
      * @param coreUser
@@ -320,6 +323,7 @@ public class TeacherOpenCourseMergeResourcesInfoController{
 
     /**
      * 教师端-不能调用这个方法， 没有判断教师身份
+     *
      * @param ids
      * @return
      */
@@ -378,7 +382,8 @@ public class TeacherOpenCourseMergeResourcesInfoController{
                 if (null != response && null != response.getOutputStream()) {
                     response.getOutputStream().close();
                 }
-                } catch (Exception e) { }
+            } catch (Exception e) {
+            }
         }
     }
 
@@ -523,14 +528,16 @@ public class TeacherOpenCourseMergeResourcesInfoController{
                 if (null != response && null != response.getOutputStream()) {
                     response.getOutputStream().close();
                 }
-                } catch (Exception e) { }
+            } catch (Exception e) {
+            }
         }
     }
 
     /**
      * 教师端-导入资源操作，逻辑拆分
-     *
+     * <p>
      * 从系统资源库拉取到教师开课的资源中。
+     *
      * @param resourcesInfoIds    资源信息ID集合
      * @param teacherOpenCourseId 开课ID
      * @return
@@ -564,10 +571,10 @@ public class TeacherOpenCourseMergeResourcesInfoController{
      * 只传左元素，表示：拖动元素 在 左元素的左侧；
      * 只传右元素，表示：拖动元素 在 右元素的右侧；
      * 左右元素都传，则拖动元素放置在两个元素的中间。
-     *
+     * <p>
      * 左侧（上） ==> 右侧（下）
      * 小数值    ==>  大数值
-     *
+     * <p>
      * 数值越小，越靠前
      *
      * @param id      拖动元素的ID

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java

@@ -189,6 +189,7 @@ public class TeacherOpenCourseMergeStudentController{
             return JsonResult.failMessage("请登录后再操作");
         }else{
             teacherOpenCourseMergeStudentQuery.setOrgId(coreUser.getOrgId());
+            teacherOpenCourseMergeStudentQuery.setUserId(coreUser.getId());
             if(null == teacherOpenCourseMergeStudentQuery.getTeacherOpenCourseSchoolClassMergeStudentStatus()){
                 teacherOpenCourseMergeStudentQuery.setTeacherOpenCourseSchoolClassMergeStudentStatus(1);
             }

web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md

@@ -420,3 +420,16 @@ randomStudentList
   @if(!isEmpty(studentSnOrName)){
     and (tb.student_sn like #'%'+studentSnOrName+'%'# or tb.student_name like #'%'+studentSnOrName+'%'#)
   @}
+
+
+getStudentClassIdList
+===
+    * 获取开课关联学生里面的班级ids
+
+    select distinct class_id
+    from student s
+    left join teacher_open_course_merge_student tocms on s.student_id = tocms.student_id
+    where student_status = 1
+    and tocms.teacher_open_course_school_class_merge_student_status = 1
+    and teacher_open_course_id = #teacherOpenCourseId#
+