1、课表organ_id_字段初始化;

2、课表列表去除团体名和班级名，搜索更改为按团体编号/课程编号/课程名搜索
3、修复对外课程无部门编号
4、节假日获取方式调整
5、线上乐团课创建

mec-biz/src/main/java/com/ym/mec/biz/dal/page/MusicGroupQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -23,6 +24,16 @@ public class MusicGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "教务老师编号")
     private Integer educationalTeacherId;
 
+    private MusicGroupStatusEnum status;
+
+    public MusicGroupStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(MusicGroupStatusEnum status) {
+        this.status = status;
+    }
+
     public Integer getEducationalTeacherId() {
         return educationalTeacherId;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/OnlineMusicGroupService.java

@@ -7,6 +7,7 @@ import com.ym.mec.common.page.QueryInfo;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public interface OnlineMusicGroupService {
 
@@ -14,7 +15,7 @@ public interface OnlineMusicGroupService {
      * 创建线上乐团班级
      * @param onlineMusicGroupCourseInfo
      */
-    void createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo);
+    Map<String, Object> createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo);
 
     /**
      * @describe 获取可以预约的教师

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

@@ -71,7 +71,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
 
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.DEFAULT)
     @Override
-    public void createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo) {
+    public Map<String, Object> createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo) {
         if(Objects.isNull(onlineMusicGroupCourseInfo.getMusicGroupId())){
             throw new BizException("请指定乐团");
         }
@@ -161,7 +161,7 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
             courseSchedule.setTeachMode(TeachModeEnum.ONLINE);
             courseSchedule.setType(CourseSchedule.CourseScheduleType.MUSIC_NETWORK);
             courseSchedule.setGroupType(GroupType.MUSIC);
-            courseSchedule.setIsLock(1);
+            courseSchedule.setIsLock(0);
             courseSchedule.setOrganId(student.getOrganId());
         }
         courseScheduleDao.batchAddCourseSchedules(courses);
@@ -208,6 +208,11 @@ public class OnlineMusicGroupServiceImpl implements OnlineMusicGroupService {
         courseScheduleStudentPaymentDao.batchInsert(courseScheduleStudentPayments);
         teacherAttendanceDao.batchInsert(teacherAttendances);
 
+        List<String> courseTimes = courses.stream().map(c -> DateUtil.dateToString(c.getStartClassTime(), "yyyy-MM-dd HH:mm:ss")).collect(Collectors.toList());
+
+        Map<String, Object> result=new HashMap<>();
+        result.put("courseTimes", StringUtils.join(courses,","));
+        return result;
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -424,7 +424,10 @@
 				AND educational_teacher_id_=#{educationalTeacherId}
 			</if>
 			<if test="search!=null">
-				AND (id_=#{search} OR name_ LIKE CONCAT('%', #{name_}, '%'))
+				AND (id_=#{search} OR name_ LIKE CONCAT('%', #{search}, '%'))
+			</if>
+			<if test="status!=null">
+				AND status_=#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 		</where>
 	</sql>

mec-web/src/main/java/com/ym/mec/web/controller/education/EduOnlineMusicGroupController.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dto.OnlineMusicGroupCourseDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
 import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
 import com.ym.mec.biz.service.MusicGroupService;
@@ -60,6 +61,7 @@ public class EduOnlineMusicGroupController extends BaseController {
             return failed("用户信息获取失败");
         }
         queryInfo.setEducationalTeacherId(sysUser.getId());
+        queryInfo.setStatus(MusicGroupStatusEnum.PROGRESS);
         return succeed(musicGroupService.findEduTeacherMusicGroups(queryInfo));
     }
 
@@ -124,8 +126,8 @@ public class EduOnlineMusicGroupController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        onlineMusicGroupService.createOnlineMusicClassGroup(onlineMusicGroupCourseInfo);
-        return succeed();
+
+        return succeed(onlineMusicGroupService.createOnlineMusicClassGroup(onlineMusicGroupCourseInfo));
     }
 
 }