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

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

@@ -135,33 +135,6 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 
 	@Override
 	public List<ImGroupModel> queryTeacherGroups(Integer userId,String search) {
-		//获取教师所在乐团列表
-		/*List<ImGroupModel> imGroupModels =  musicGroupDao.queryTeacherGroups(userId,search);
-
-		if(imGroupModels != null && imGroupModels.size() > 0){
-			//获取乐团id列表
-			Set<String> musicGroupIds = imGroupModels.stream().map(e -> e.getId()).collect(Collectors.toSet());
-			List<MusicGroup> musicGroups = musicGroupDao.queryListByIds(musicGroupIds);
-			List<Map<String, BigDecimal>> musicGroupUserNums = musicGroupDao.countMusicGroupUserNum(StringUtils.join(musicGroupIds,","));
-			Map<String, BigDecimal> musicGroupUserNumMap = MapUtil.convertMybatisMap(musicGroupUserNums);
-			imGroupModels.forEach(e -> {
-				Set<Integer> teachers = e.getName() == null?new HashSet<>():new HashSet(Arrays.asList(e.getName().split(",")));
-				MusicGroup musicGroup = musicGroups.stream().filter(mg -> mg.getId().equals(e.getId())).findFirst().get();
-				//获取教学老师id列表
-//				Set<Integer> teachers = musicGroupDao.queryTeacherIds(e.getId());
-				teachers.add(musicGroup.getTeamTeacherId());
-				teachers.add(musicGroup.getEducationalTeacherId());
-				teachers.add(musicGroup.getOperatorUserId());
-				teachers.add(musicGroup.getDirectorUserId());
-				teachers.removeAll(Collections.singleton(null));
-				//获取乐团群用户总数
-				BigDecimal count = musicGroupUserNumMap.get(e.getId());
-				e.setCount(count == null?0:count.intValue() + teachers.size());
-				e.setId("mg" + e.getId());
-			});
-		}else {
-			imGroupModels = new ArrayList<>();
-		}*/
 		//获取教师所在班级列表
 		List<ImGroupModel> imGroupModels =  classGroupDao.queryTeacherGroups(userId,search);
 		if(imGroupModels != null && imGroupModels.size() > 0){

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

@@ -207,7 +207,7 @@
 		LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
 		LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
 		LEFT JOIN sys_user su ON  su.id_ = sr.user_id_
-		WHERE sr.user_id_ = #{userId} AND sr.music_group_status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
+		WHERE sr.user_id_ = #{userId} AND mg.status_ IN ('APPLY','PAY','PREPARE','PROGRESS')
 		ORDER BY mg.create_time_ DESC
 	</select>
 

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

@@ -187,7 +187,7 @@
     <sql id="queryPaymentOrder">
         <where>
             <if test="organId != null">
-                AND FIND_IN_SET(spo.organ_id_,#{organId})
+                AND FIND_IN_SET(su.organ_id_,#{organId})
             </if>
             <if test="orderStartDate != null">
                 AND DATE_FORMAT(spo.create_time_,'%Y-%m-%d') &gt;= #{orderStartDate}