Merge remote-tracking branch 'origin/master'

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

@@ -113,6 +113,9 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
         if(classGroupNoStartCourseSchedules == null || classGroupNoStartCourseSchedules.size()==0){
             return true;
         }
+        //删除未开始的课程老师课酬
+        List<Long> courseScheduleIds = classGroupNoStartCourseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
+        courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
 
         for (CourseSchedule classGroupNoStartCourseSchedule : classGroupNoStartCourseSchedules) {
 

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

@@ -341,12 +341,8 @@
         </if>
     </select>
     <select id="findNoClassSubjects" resultMap="ClassGroup">
-        SELECT * FROM class_group cg
-        WHERE cg.id_ NOT IN
-        (SELECT cgr.sub_class_group_id_ FROM class_group_relation cgr
-        LEFT JOIN class_group cg ON cg.id_ = cgr.class_group_id_
-        WHERE cg.music_group_id_ = #{musicGroupId})
-        AND cg.music_group_id_ = #{musicGroupId} AND type_ = 'NORMAL' AND cg.del_flag_ = 0
+        SELECT cg.* FROM class_group cg LEFT JOIN class_group_relation cgr ON cgr.sub_class_group_id_=cg.id_
+        WHERE cg.music_group_id_=#{musicGroupId} AND cg.type_ = 'NORMAL' AND cg.del_flag_ = '0' AND cgr.id_ IS NULL
     </select>
 
     <select id="countTeacherNum" resultType="java.lang.Integer">

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

@@ -151,6 +151,7 @@
         <foreach collection="classGroupIds" item="classGroupId" open="(" close=")" separator=",">
             #{classGroupId}
         </foreach>
+        AND status_ = 'NORMAL'
     </select>
 
     <!-- 查询班级某状态的所有学生 -->

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

@@ -856,7 +856,7 @@
                     leave_student_num_ = #{item.leaveStudentNum},
                 </if>
                 <if test="item.schoolId != null">
-                    school_id_ = #{item.choolId},
+                    school_id_ = #{item.schoolId},
                 </if>
             </set>
             WHERE id_ = #{item.id}

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

@@ -88,7 +88,7 @@
 	</delete>
 
     <delete id="batchDeleteByCourseScheduleIds">
-		DELETE FROM course_schedule_teacher_salary WHERE id_ IN
+		DELETE FROM course_schedule_teacher_salary WHERE course_schedule_id_ IN
 		<foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
 			#{courseScheduleId}
 		</foreach>

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -41,7 +41,7 @@ public class MusicGroupRegisterController extends BaseController {
         }
         StudentRegistration hasReg = studentRegistrationService.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
         if (hasReg != null) {
-            return failed("该乐团您已注册");
+            return failed("该乐团您已报名");
         }
         if (musicGroup.getApplyExpireDate().compareTo(date) <= 0) {
             return failed("乐团已截止报名");

mec-task/src/main/java/com/ym/mec/task/jobs/HomeworkNoReplyRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class HomeworkNoReplyRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/PushNoSignOutMessageTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class PushNoSignOutMessageTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/StudentCoursesScheduleRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class StudentCoursesScheduleRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/StudentHomeworkRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class StudentHomeworkRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/StudentSignInRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class StudentSignInRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/TeacherCoursesScheduleRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class TeacherCoursesScheduleRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/TeacherSignInRemaindTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class TeacherSignInRemaindTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/UserAutoUnlockedTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.auth.api.client.AuthTaskFeignService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class UserAutoUnlockedTask extends BaseTask {
 
 	@Autowired

mec-task/src/main/java/com/ym/mec/task/jobs/VipGroupTeacherSalarySettlementTask.java

@@ -1,11 +1,13 @@
 package com.ym.mec.task.jobs;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.ym.mec.task.TaskRemoteService;
 import com.ym.mec.task.core.BaseTask;
 import com.ym.mec.task.core.TaskException;
 
+@Service
 public class VipGroupTeacherSalarySettlementTask extends BaseTask {
 
 	@Autowired