update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

@@ -39,6 +39,10 @@ public class SysMusicScore {
 	/** 带节拍器原音MP3 */
 	private String metronomeUrl;
 
+	private String accompanimentUrl;
+
+	private String accompanimentMetronomeUrl;
+
 	/** 原音MP3 */
 	private String createUserName;
 	
@@ -66,6 +70,22 @@ public class SysMusicScore {
 	//是否显示
 	private Integer showFlag = 0;
 
+	public String getAccompanimentUrl() {
+		return accompanimentUrl;
+	}
+
+	public void setAccompanimentUrl(String accompanimentUrl) {
+		this.accompanimentUrl = accompanimentUrl;
+	}
+
+	public String getAccompanimentMetronomeUrl() {
+		return accompanimentMetronomeUrl;
+	}
+
+	public void setAccompanimentMetronomeUrl(String accompanimentMetronomeUrl) {
+		this.accompanimentMetronomeUrl = accompanimentMetronomeUrl;
+	}
+
 	public String getMetronomeUrl() {
 		return metronomeUrl;
 	}

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
@@ -13,4 +15,5 @@ public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore
 
     void del(Integer id);
 
+    PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -10,9 +10,11 @@ import com.ym.mec.biz.dal.dto.MusicScoreDto;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
 import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -129,4 +131,33 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 			}
 		}
 	}
+
+	private String getParentTreeName(Integer categoriesId){
+		StringBuffer sb = new StringBuffer();
+		while (true){
+			SysMusicScoreCategories categories = sysMusicScoreCategoriesDao.get(categoriesId);
+			if(sb.length() == 0){
+				sb.append(categories.getName());
+			}else {
+				sb.insert(0,"/");
+				sb.insert(0,categories.getName());
+			}
+			if(categories.getParentId() == 0){
+				return sb.toString();
+			}
+			categoriesId = categories.getParentId();
+		}
+	}
+
+	@Override
+	public PageInfo<SysMusicScore> queryMusicScorePage(SysExamSongQueryInfo queryInfo) {
+		PageInfo<SysMusicScore> sysMusicScorePageInfo = queryPage(queryInfo);
+		List<SysMusicScore> rows = sysMusicScorePageInfo.getRows();
+		if(rows != null && rows.size() > 0){
+			for (SysMusicScore row : rows) {
+				row.setCategoriesName(getParentTreeName(row.getCategoriesId()));
+			}
+		}
+		return sysMusicScorePageInfo;
+	}
 }

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

@@ -17,6 +17,8 @@
 		<result column="speed_" property="speed" />
 		<result column="url_" property="url" />
 		<result column="metronome_url_" property="metronomeUrl" />
+		<result column="accompaniment_url_" property="accompanimentUrl" />
+		<result column="accompaniment_metronome_url_" property="accompanimentMetronomeUrl" />
 		<result column="create_user_id_" property="createUserId" />
 		<result column="create_user_name_" property="createUserName" />
 		<result column="del_flag_" property="delFlag" />
@@ -94,8 +96,10 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
-		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_,
+		smsa.mp3_url_ accompaniment_url_,smsa.metronome_url_ accompaniment_metronome_url_
 		FROM sys_music_score ses
+		LEFT JOIN sys_music_score_accompaniment smsa ON smsa.exam_song_id_ = ses.id_
 		LEFT JOIN sys_user su ON ses.create_user_id_ = su.id_
 		LEFT JOIN sys_music_score_categories smsc ON smsc.id_ = ses.music_score_categories_id_
 		<include refid="queryPageSql"/>

mec-web/src/main/java/com/ym/mec/web/controller/SysMusicScoreController.java

@@ -96,6 +96,6 @@ public class SysMusicScoreController extends BaseController {
             byCategoriesIds = sysMusicScoreCategoriesDao.findByCategoriesIds(byCategoriesIds);
             queryInfo.setCategoriesId(byCategoriesIds);
         }
-        return succeed(sysMusicScoreService.queryPage(queryInfo));
+        return succeed(sysMusicScoreService.queryMusicScorePage(queryInfo));
     }
 }