Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ClassGroup4MixDto.java

@@ -51,6 +51,9 @@ public class ClassGroup4MixDto {
     @ApiModelProperty(value = "预计学生人数", required = true)
     private Integer expectStudentNum;
 
+    @ApiModelProperty(value = "声部id", required = true)
+    private Integer subjectId;
+
     public String getMusicGroupId() {
         return musicGroupId;
     }
@@ -162,4 +165,12 @@ public class ClassGroup4MixDto {
     public void setExpectStudentNum(Integer expectStudentNum) {
         this.expectStudentNum = expectStudentNum;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1383,6 +1383,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<StudentRegistration> studentList = studentRegistrationService.findStudentListByUserIdList(musicGroupId, studentIdList);
 
         List<Integer> subjectIdList = studentList.stream().map(student -> student.getActualSubjectId()).collect(Collectors.toList());
+        TeachModeEnum teachMode = TeachModeEnum.OFFLINE;
+        if(classGroup4MixDto.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)){
+            subjectIdList.clear();
+            subjectIdList.add(classGroup4MixDto.getSubjectId());
+            teachMode = TeachModeEnum.ONLINE;
+        }
 
         List<Subject> subjectList = subjectService.findBySubjectByIdList(subjectIdList);
 
@@ -1514,7 +1520,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setEndClassTime(DateUtil.stringToDate(endClassTime));
                 courseSchedule.setCreateTime(date);
                 courseSchedule.setUpdateTime(date);
-                courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
+                courseSchedule.setTeachMode(teachMode);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setOrganId(musicGroup.getOrganId());
@@ -1651,6 +1657,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (classGroup == null) {
             throw new BizException("班级不存在");
         }
+
+        TeachModeEnum teachMode = TeachModeEnum.OFFLINE;
+        if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)){
+            teachMode = TeachModeEnum.ONLINE;
+        }
+
         List<ClassGroupTeacherMapper> byClassGroup = classGroupTeacherMapperDao.findByClassGroup(classGroupId);
         if(byClassGroup != null && byClassGroup.size() > 0){
             ClassGroupTeacherMapper groupTeacherMapper = byClassGroup.stream().filter(classGroupTeacherMapper -> classGroupTeacherMapper.getTeacherRole() == TeachTypeEnum.BISHOP).findFirst().get();
@@ -1810,7 +1822,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setEndClassTime(DateUtil.stringToDate(endClassTime));
                 courseSchedule.setCreateTime(date);
                 courseSchedule.setUpdateTime(date);
-                courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
+                courseSchedule.setTeachMode(teachMode);
                 courseSchedule.setMusicGroupId(classGroup.getMusicGroupId());
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 if(classGroup4MixDto.getCourseType().equals(CourseSchedule.CourseScheduleType.MIX)){