Merge remote-tracking branch 'origin/master'

cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -37,9 +37,14 @@
 			<if test="search != null">
 				and title_ like '%' #{search} '%'
 			</if>
-			<if test="memo != null">
-				and memo_ = #{memo}
-			</if>
+			<choose>
+		        <when test="memo != null and memo != ''">
+		            and memo_ = #{memo}
+		        </when>
+		        <otherwise>
+		            and memo_ is null
+		        </otherwise>
+		    </choose>
 		</where>
 	</sql>
 	

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

@@ -280,6 +280,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			subSidy = school.getSubsidy();
 		}
+		
+		//查询声部
+		String subjectName = subjectDao.findNames(classGroup.getSubjectIdList());
 
 		// 查询班级老师信息
 		List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.getClassGroupTeachers(classGroupId);
@@ -341,6 +344,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		// 查询班级学生信息
 		List<ClassGroupStudentMapper> classGroupStudentMapperList = classGroupStudentMapperDao.findByClassGroup(classGroupId);
+		String usernameList = classGroupStudentMapperList.stream().map(ClassGroupStudentMapper::getUserName).collect(Collectors.joining("、"));
 
 		Map<Integer, CourseTimeDto> dayOfWeekMap = teachingArrangementList.stream().collect(Collectors.toMap(CourseTimeDto::getDayOfWeek, ct -> ct));
 
@@ -409,6 +413,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					courseSchedule.setName(classGroup.getName());
 					courseSchedule.setSchoolId(schoolId);
 					courseSchedule.setSubsidy(subSidy);
+					if (type == CourseScheduleType.PRACTICE || type == CourseScheduleType.VIP) {
+						courseSchedule.setName(subjectName + "•" + usernameList);
+					} else {
+						courseSchedule.setName(type.getMsg());
+					}
 					courseScheduleList.add(courseSchedule);
 
 					// 课程与老师薪水表
@@ -508,7 +517,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		
 		//检查冲突
 		checkNewCourseSchedules(courseScheduleList, false);
-        createCourseScheduleName(courseScheduleList);
 
 		if (courseScheduleList.size() > 0) {
 			courseScheduleDao.batchAddCourseSchedules(courseScheduleList);

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

@@ -266,7 +266,7 @@
         LEFT JOIN music_group mg ON mg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'MUSIC'
         LEFT JOIN vip_group vg ON vg.id_ = cgsm.music_group_id_ AND cgsm.group_type_ = 'VIP'
         WHERE (cgtm.user_id_ = #{teacherId} OR mg.team_teacher_id_ = #{teacherId} OR mg.educational_teacher_id_ = #{teacherId}
-        OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND sr.music_group_status_ != 'QUIT'
+        OR director_user_id_ = #{teacherId}) AND su.id_ IS NOT NULL AND (sr.music_group_status_ != 'QUIT' OR sr.id_ IS NULL)
         AND (mg.status_ = 'PROGRESS' OR vg.group_status_ IN (2,4) OR cgsm.group_type_ = 'PRACTICE')
         <if test="search != null">
             AND su.username_ LIKE CONCAT('%',#{search},'%')