Merge remote-tracking branch 'origin/master'

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

@@ -699,7 +699,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							}else {
 								BigDecimal salary = teacherPracticeSalaryMap.get(cgtm.getUserId());
 								if (salary == null) {
-									throw new BizException("请设置老师陪练课课酬");
+									throw new BizException("请设置老师网管课课酬");
 								}
 								courseScheduleTeacherSalary.setExpectSalary(salary);
 							}

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

@@ -1148,6 +1148,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 throw new BizException("请指定教师类型");
             }
             List<TeacherDefaultMusicGroupSalary> teacherSalaryList = teacherSalaryMap.get(courseScheduleTeacherSalary.getUserId());
+            if(teacherSalaryList == null || teacherSalaryList.size() == 0){
+            	throw new BizException("请设置老师课酬");
+            }
 
             BigDecimal salary;
 

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

@@ -382,6 +382,7 @@
 		WHERE
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
+		  	AND mg.status_ = 'PROGRESS'
 			AND DATE_FORMAT( spr.create_time_, '%Y-%m' ) <= #{month}
 		GROUP BY
 			mg.organ_id_
@@ -404,8 +405,11 @@
 			mg.del_flag_ = 0
 			AND mg.organ_id_ IS NOT NULL
 			AND mg.status_ = 'PROGRESS'
+			<if test="paymentStatus==null">
+				AND sr.music_group_status_ IN ('APPLY', 'NORMAL')
+			</if>
 		  	<if test="paymentStatus!=null">
-				AND sr.music_group_status_ IN ('NORMAL', 'QUIT')
+				AND sr.music_group_status_ IN ('NORMAL')
 				AND sr.payment_status_ = #{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>
 			AND DATE_FORMAT( sr.create_time_, '%Y-%m' ) &lt;= #{month}