1、课表organ_id_字段初始化;

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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupStudentFeeDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.SimpleUserDto;
 import com.ym.mec.biz.dal.dto.UpdateStudentFeeDto;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.common.dal.BaseDAO;
@@ -103,6 +104,15 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	Integer countStudentNoPayNum(String musicGroupId);
 
 	/**
+	 * 获取当前乐团对应缴费状态的学院
+	 * @param musicGroupId
+	 * @param paymentStatus
+	 * @return
+	 */
+	List<SimpleUserDto> findStudentWithMusicGroupAndPaymentStatus(@Param("musicGroupId") String musicGroupId,
+																  @Param("paymentStatus")MusicGroupStudentFee.PaymentStatus paymentStatus);
+
+	/**
 	 * 根据乐团声部修改学员课程费用
 	 * @param musicGroupId
 	 * @param subjectId

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

@@ -31,4 +31,6 @@ public interface MusicGroupStudentFeeService extends BaseService<Long, MusicGrou
 	 * @param studentFeeDto
 	 */
 	void updateStudentFeeIsLock(UpdateStudentFeeDto studentFeeDto);
+
+
 }

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

@@ -186,7 +186,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
             throw new BizException("用户[{}]现金账户不存在", userId);
         }
 
-        boolean isChange=amount.compareTo(cashAccount.getCourseBalance())!=0;
+        amount = decimal.subtract(cashAccount.getCourseBalance());
         
         Date date = new Date();
 
@@ -195,7 +195,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 
         sysUserCashAccountDao.update(cashAccount);
 
-        if (isChange) {
+        if (amount.compareTo(cashAccount.getCourseBalance())!=0) {
             SysUserCoursesAccountDetail sysUserCoursesAccountDetail = new SysUserCoursesAccountDetail();
             sysUserCoursesAccountDetail.setUserId(userId);
             sysUserCoursesAccountDetail.setAmount(amount);

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

@@ -194,6 +194,16 @@
         SELECT * FROM music_group_student_fee_ WHERE music_group_id_ = #{musicGroupId}
     </select>
 
+    <select id="findStudentWithMusicGroupAndPaymentStatus" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
+        SELECT
+            DISTINCT su.id_ userId,
+            su.real_name_ userName,
+            su.avatar_ avatar
+        FROM music_group_student_fee_ mgsf
+        LEFT JOIN sys_user su ON su.id_=mgsf.user_id_
+        WHERE music_group_id_='19120116225600001' AND payment_status_='PAID_COMPLETED'
+    </select>
+
     <update id="batchUpdate" parameterType="java.util.List">
     	<foreach collection="list" item="item" index="index" open="" close="" separator=";">
         UPDATE music_group_student_fee_