Merge branch 'musicScore' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

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

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

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

@@ -22,7 +22,7 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
 
     void deleteBySongId(Integer id);
 
-    Object queryAccPage(Map<String, Object> params);
+    List<SysMusicScoreAccompaniment> queryAccPage(Map<String, Object> params);
 
     int findAccCount(Map<String, Object> params);
 }

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

@@ -3,11 +3,13 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
+import java.util.List;
 
+public interface SysMusicScoreCategoriesDao extends BaseDAO<Integer, SysMusicScoreCategories> {
 
-    List<SysMusicScoreCategories> findByParentId(Integer parentId);
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreAccompanimentService.java

@@ -5,11 +5,13 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.util.List;
+
 public interface SysMusicScoreAccompanimentService extends BaseService<Integer, SysMusicScoreAccompaniment> {
 
     void updateAcc(SysMusicScoreAccompaniment sysMusicScoreAccompaniment);
 
-    Object queryAll(SysExamSongQueryInfo queryInfo);
+    List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 
-    Object queryAccPage(SysExamSongQueryInfo queryInfo);
+    List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -44,14 +44,14 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	}
 
 	@Override
-	public Object queryAll(SysExamSongQueryInfo queryInfo) {
+	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryPage(params);
 	}
 
 	@Override
-	public Object queryAccPage(SysExamSongQueryInfo queryInfo) {
+	public List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
 		return sysMusicScoreAccompanimentDao.queryAccPage(params);

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

@@ -146,7 +146,7 @@
 			</if>
 		</where>
 	</select>
-	<select id="queryAccPage" resultType="java.lang.Object">
+	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_
 		FROM sys_music_score_accompaniment sesa
 		LEFT JOIN sys_exam_song ses ON ses.id_ = sesa.exam_song_id_

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

@@ -77,7 +77,6 @@
 	<select id="findByParentId" resultMap="SysMusicScoreCategories">
 		SELECT sm.* FROM sys_music_score_categories sm
 		<include refid="queryTree"/>
-		GROUP BY sm.id_
 		ORDER BY sm.id_ DESC
 	</select>
 	<sql id="queryTree">