Merge remote-tracking branch 'origin/master'

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

@@ -641,9 +641,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 }
                 studentPaymentOrder.setExpectAmount(reduce);
                 //当前学员是否以前存在过当前乐团
-                StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
-                if(registration != null){
-                    studentRegistration.setId(registration.getId());
+//                StudentRegistration registration = studentRegistrationDao.queryByUserIdAndMusicGroupId(userId, musicGroupId);
+                if(phoneAndMusicGroupId != null){
+                    studentRegistration.setId(phoneAndMusicGroupId.getId());
                     studentRegistrationDao.update(studentRegistration);
                 }else {
                     studentRegistrationDao.insertBasic(studentRegistration);

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

@@ -534,7 +534,7 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
-            cg.del_flag_ = 0  AND ta.teacher_id_ = cs.actual_teacher_id_ AND cg.group_type_ = 'MUSIC'
+            cg.del_flag_ = 0 AND (ta.teacher_id_ = cs.actual_teacher_id_ OR ta.id_ IS NULL) AND cg.group_type_ = 'MUSIC'
             <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>

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

@@ -183,7 +183,7 @@
                 music_group_id_ = #{musicGroupId},
             </if>
             <if test="actualSubjectId != null">
-            actual_subject_id_ = #{actualSubjectId},
+              actual_subject_id_ = #{actualSubjectId},
             </if>
             <if test="classGroupId != null">
                 class_group_id_ = #{classGroupId},
@@ -377,7 +377,7 @@
         <result column="wechat_id_" property="wechatId"/>
     </resultMap>
     <select id="getSysUserByPhone" resultMap="FindSysUser">
-        SELECT * FROM sys_user WHERE phone_ = #{phone}
+        SELECT * FROM sys_user WHERE phone_ = #{phone} LIMIT 1
     </select>
 
     <!-- 获取班级下的学生 -->
@@ -439,10 +439,10 @@
     <insert id="insertBasic" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
         INSERT INTO student_registration
         (parents_phone_,user_id_,name_,music_group_id_,current_grade_,current_class_,subject_id_,
-        create_time_,update_time_,parents_name_,payment_status_,actual_subject_id_,music_group_status_,temporary_course_fee_)
+        create_time_,update_time_,parents_name_,payment_status_,actual_subject_id_,music_group_status_,temporary_course_fee_,class_group_id_)
         VALUES (#{parentsPhone},#{userId},#{name},#{musicGroupId},#{currentGrade},#{currentClass},#{subjectId},
             now(),now(),#{parentsName},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subjectId},
-            #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{temporaryCourseFee})
+            #{musicGroupStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{temporaryCourseFee},#{classGroupId})
     </insert>
 
     <!-- 查询乐团userIdList的学生 -->