Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -72,7 +72,7 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param organId
      * @return
      */
-    List<Teacher> findTeachers(@Param("organId") String organId);
+    List<Teacher> findTeachers(@Param("organId") String[] organId);
 
     /**
      * count上课结算列表

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

@@ -1105,6 +1105,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                 CourseSchedule courseSchedule = new CourseSchedule();
                 courseSchedule.setSchoolId(schoolId);
+                courseSchedule.setMusicGroupId(musicGroupId);
                 courseSchedule.setClassGroupId(classGroup.getId());
                 courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                 courseSchedule.setClassDate(classDate);
@@ -1156,6 +1157,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseScheduleTeacherSalary.setUserId(classGroupTeacherMapper.getUserId());
                     courseScheduleTeacherSalary.setExpectSalary(salary);
                     courseScheduleTeacherSalary.setClassGroupId(classGroup.getId());
+                    courseScheduleTeacherSalary.setMusicGroupId(musicGroupId);
                     courseScheduleTeacherSalary.setCreateTime(date);
                     courseScheduleTeacherSalary.setUpdateTime(date);
                     courseScheduleTeacherSalaryList.add(courseScheduleTeacherSalary);
@@ -1163,6 +1165,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 for (StudentRegistration studentRegistration : studentList) {
                     CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
                     courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                    courseScheduleStudentPayment.setMusicGroupId(musicGroupId);
                     courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                     courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                     courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());
@@ -1493,6 +1496,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                 CourseSchedule courseSchedule = new CourseSchedule();
                 courseSchedule.setSchoolId(schoolId);
+                courseSchedule.setMusicGroupId(musicGroupId);
                 courseSchedule.setClassGroupId(classGroup.getId());
                 courseSchedule.setStatus(CourseStatusEnum.NOT_START);
                 courseSchedule.setClassDate(classDate);
@@ -1539,6 +1543,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
                     CourseScheduleTeacherSalary courseScheduleTeacherSalary = new CourseScheduleTeacherSalary();
                     courseScheduleTeacherSalary.setCourseScheduleId(courseSchedule.getId());
+                    courseScheduleTeacherSalary.setMusicGroupId(musicGroupId);
                     courseScheduleTeacherSalary.setGroupType(courseSchedule.getGroupType());
                     courseScheduleTeacherSalary.setMusicGroupId(courseSchedule.getMusicGroupId());
                     courseScheduleTeacherSalary.setTeacherRole(classGroupTeacherMapper.getTeacherRole());
@@ -1552,6 +1557,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 for (StudentRegistration studentRegistration : studentList) {
                     CourseScheduleStudentPayment courseScheduleStudentPayment = new CourseScheduleStudentPayment();
                     courseScheduleStudentPayment.setGroupType(classGroup.getGroupType());
+                    courseScheduleStudentPayment.setMusicGroupId(musicGroupId);
                     courseScheduleStudentPayment.setMusicGroupId(classGroup.getMusicGroupId());
                     courseScheduleStudentPayment.setCourseScheduleId(courseSchedule.getId());
                     courseScheduleStudentPayment.setUserId(studentRegistration.getUserId());

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

@@ -197,7 +197,11 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
     @Override
     public List<Teacher> findTeachers(String organId) {
-		return teacherDao.findTeachers(organId);
+		String[] organIds = null;
+		if(StringUtils.isNotEmpty(organId)){
+			organIds = organId.split(",");
+		}
+		return teacherDao.findTeachers(organIds);
     }
 
 	@Override

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

@@ -407,8 +407,9 @@
 
     <!-- 获取乐团声部下的学生 -->
     <select id="findMusicGroupStudent" resultMap="StudentRegistration">
-        SELECT sr.*,cg.name_ class_group_name_ FROM student_registration sr
+        SELECT sr.*,cg.name_ class_group_name_,su.gender_ gender_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
+        LEFT JOIN sys_user su on sr.user_id_ = su.id_
         WHERE sr.music_group_id_ = #{musicGroupId}
         <if test="actualSubjectId != null">
             AND sr.actual_subject_id_ = #{actualSubjectId}

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

@@ -273,11 +273,14 @@
     </select>
 
     <select id="findTeachers" resultMap="Teacher">
-        SELECT su.* FROM teacher t
+        SELECT su.id_,su.real_name_ FROM teacher t
         LEFT JOIN sys_user su on t.id_ = su.id_
         <where>
             <if test="organId != null">
-                FIND_IN_SET(t.organ_id_,#{organId})
+                t.organ_id_ IN
+                <foreach collection="organId" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
             </if>
         </where>
     </select>