Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into fee_audit

cms/src/main/java/com/ym/mec/cms/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/dto/MusicScoreQueryInfo.java

@@ -0,0 +1,16 @@
+package com.ym.mec.auth.api.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class MusicScoreQueryInfo {
+    @ApiModelProperty(value = "父节点编号，默认0",required = false)
+    private Integer parentId = 0;
+
+    public Integer getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Integer parentId) {
+        this.parentId = parentId;
+    }
+}

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

@@ -0,0 +1,28 @@
+package com.ym.mec.biz.dal.dao;
+
+
+import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusicScoreAccompaniment> {
+
+
+    void batchInsert(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments,
+                     @Param("sysMusicScoreId") Integer sysMusicScoreId);
+
+    void batchDel(@Param("delExamSongAccompanimentIds") List<Integer> delExamSongAccompanimentIds);
+
+    List<Integer> findSubjectByMusicScoreId(@Param("sysMusicScoreId") Integer sysMusicScoreId, @Param("idList") List<Integer> idList);
+
+    void batchUpdate(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments);
+
+    void deleteBySongId(Integer id);
+
+    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

@@ -0,0 +1,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> {
+
+    List<SysMusicScoreCategories> findByParentId(@Param("parentId") Integer parentId);
+}

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

@@ -0,0 +1,10 @@
+package com.ym.mec.biz.dal.dao;
+
+
+import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.common.dal.BaseDAO;
+
+public interface SysMusicScoreDao extends BaseDAO<Integer, SysMusicScore> {
+
+	
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicScoreDto.java

@@ -0,0 +1,41 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+public class MusicScoreDto {
+    @ApiModelProperty(value = "曲库", required = false)
+    private SysMusicScore sysMusicScore;
+
+    @ApiModelProperty(value = "曲库伴奏", required = false)
+    private List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments;
+
+    private List<Integer> delExamSongAccompanimentIds;
+
+    public List<Integer> getDelExamSongAccompanimentIds() {
+        return delExamSongAccompanimentIds;
+    }
+
+    public void setDelExamSongAccompanimentIds(List<Integer> delExamSongAccompanimentIds) {
+        this.delExamSongAccompanimentIds = delExamSongAccompanimentIds;
+    }
+
+    public SysMusicScore getSysMusicScore() {
+        return sysMusicScore;
+    }
+
+    public void setSysMusicScore(SysMusicScore sysMusicScore) {
+        this.sysMusicScore = sysMusicScore;
+    }
+
+    public List<SysMusicScoreAccompaniment> getSysMusicScoreAccompaniments() {
+        return sysMusicScoreAccompaniments;
+    }
+
+    public void setSysMusicScoreAccompaniments(List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments) {
+        this.sysMusicScoreAccompaniments = sysMusicScoreAccompaniments;
+    }
+}

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

@@ -0,0 +1,170 @@
+package com.ym.mec.biz.dal.entity;
+
+import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_music_score):
+ */
+public class SysMusicScore {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer musicScoreCategoriesId;
+	
+	/** 名称 */
+	private String name;
+
+	/** 名称 */
+	private String categoriesName;
+
+	/** 名称 */
+	private Integer categoriesId;
+	
+	/** 类型PERSON 个人,COMMON公用 */
+	private ExamSongTypeEnum type;
+	
+	/** 声部列表 */
+	private String subjectIds;
+	
+	/** 速度 */
+	private Integer speed;
+	
+	/** 原音MP3 */
+	private String url;
+
+	/** 原音MP3 */
+	private String createUserName;
+	
+	/** 上传人 */
+	private Integer createUserId;
+	
+	/** 是否删除1是0否 */
+	private Integer delFlag;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/**  */
+	private java.util.Date createTime;
+
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
+	public String getCategoriesName() {
+		return categoriesName;
+	}
+
+	public void setCategoriesName(String categoriesName) {
+		this.categoriesName = categoriesName;
+	}
+
+	public String getCreateUserName() {
+		return createUserName;
+	}
+
+	public void setCreateUserName(String createUserName) {
+		this.createUserName = createUserName;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setMusicScoreCategoriesId(Integer musicScoreCategoriesId){
+		this.musicScoreCategoriesId = musicScoreCategoriesId;
+	}
+	
+	public Integer getMusicScoreCategoriesId(){
+		return this.musicScoreCategoriesId;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+
+	public ExamSongTypeEnum getType() {
+		return type;
+	}
+
+	public void setType(ExamSongTypeEnum type) {
+		this.type = type;
+	}
+
+	public void setSubjectIds(String subjectIds){
+		this.subjectIds = subjectIds;
+	}
+	
+	public String getSubjectIds(){
+		return this.subjectIds;
+	}
+			
+	public void setSpeed(Integer speed){
+		this.speed = speed;
+	}
+	
+	public Integer getSpeed(){
+		return this.speed;
+	}
+			
+	public void setUrl(String url){
+		this.url = url;
+	}
+	
+	public String getUrl(){
+		return this.url;
+	}
+			
+	public void setCreateUserId(Integer createUserId){
+		this.createUserId = createUserId;
+	}
+	
+	public Integer getCreateUserId(){
+		return this.createUserId;
+	}
+			
+	public void setDelFlag(Integer delFlag){
+		this.delFlag = delFlag;
+	}
+	
+	public Integer getDelFlag(){
+		return this.delFlag;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,180 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(sys_music_score_accompaniment):
+ */
+public class SysMusicScoreAccompaniment {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer examSongId;
+	
+	/**  */
+	private Integer subjectId;
+
+	/**  */
+	private String subjectName;
+	
+	/**  */
+	private String mp3Url;
+	
+	/** 是否删除 */
+	private Integer delFlag;
+	
+	/** 速度 */
+	private Integer speed;
+	
+	/**  */
+	private String xmlUrl;
+
+	/**  */
+	private String examSongName;
+
+	/**  */
+	private String categoriesName;
+
+	/**  */
+	private Integer categoriesId;
+
+	/**  */
+	private String type;
+
+	/**  */
+	private String url;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	public Integer getCategoriesId() {
+		return categoriesId;
+	}
+
+	public void setCategoriesId(Integer categoriesId) {
+		this.categoriesId = categoriesId;
+	}
+
+	public String getCategoriesName() {
+		return categoriesName;
+	}
+
+	public void setCategoriesName(String categoriesName) {
+		this.categoriesName = categoriesName;
+	}
+
+	public String getSubjectName() {
+		return subjectName;
+	}
+
+	public void setSubjectName(String subjectName) {
+		this.subjectName = subjectName;
+	}
+
+	public String getExamSongName() {
+		return examSongName;
+	}
+
+	public void setExamSongName(String examSongName) {
+		this.examSongName = examSongName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setExamSongId(Integer examSongId){
+		this.examSongId = examSongId;
+	}
+	
+	public Integer getExamSongId(){
+		return this.examSongId;
+	}
+			
+	public void setSubjectId(Integer subjectId){
+		this.subjectId = subjectId;
+	}
+	
+	public Integer getSubjectId(){
+		return this.subjectId;
+	}
+			
+	public void setMp3Url(String mp3Url){
+		this.mp3Url = mp3Url;
+	}
+	
+	public String getMp3Url(){
+		return this.mp3Url;
+	}
+			
+	public void setDelFlag(Integer delFlag){
+		this.delFlag = delFlag;
+	}
+	
+	public Integer getDelFlag(){
+		return this.delFlag;
+	}
+			
+	public void setSpeed(Integer speed){
+		this.speed = speed;
+	}
+	
+	public Integer getSpeed(){
+		return this.speed;
+	}
+			
+	public void setXmlUrl(String xmlUrl){
+		this.xmlUrl = xmlUrl;
+	}
+	
+	public String getXmlUrl(){
+		return this.xmlUrl;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,104 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.List;
+
+/**
+ * 对应数据库表(sys_music_score_categories):
+ */
+public class SysMusicScoreCategories {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer parentId;
+	
+	/** 名称 */
+	private String name;
+	
+	/** 封面图片 */
+	private String coverImg;
+	
+	/** 操作人 */
+	private Integer operatorId;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+
+	private List<SysMusicScoreCategories> sysMusicScoreCategoriesList;
+
+	public List<SysMusicScoreCategories> getSysMusicScoreCategoriesList() {
+		return sysMusicScoreCategoriesList;
+	}
+
+	public void setSysMusicScoreCategoriesList(List<SysMusicScoreCategories> sysMusicScoreCategoriesList) {
+		this.sysMusicScoreCategoriesList = sysMusicScoreCategoriesList;
+	}
+
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setParentId(Integer parentId){
+		this.parentId = parentId;
+	}
+	
+	public Integer getParentId(){
+		return this.parentId;
+	}
+			
+	public void setName(String name){
+		this.name = name;
+	}
+	
+	public String getName(){
+		return this.name;
+	}
+			
+	public void setCoverImg(String coverImg){
+		this.coverImg = coverImg;
+	}
+	
+	public String getCoverImg(){
+		return this.coverImg;
+	}
+			
+	public void setOperatorId(Integer operatorId){
+		this.operatorId = operatorId;
+	}
+	
+	public Integer getOperatorId(){
+		return this.operatorId;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -14,6 +14,27 @@ public class SysExamSongQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "类型",required = true)
     private String type;
 
+    @ApiModelProperty(value = "曲库分类",required = true)
+    private Integer categoriesId;
+
+    private Integer sysMusicScoreId;
+
+    public Integer getCategoriesId() {
+        return categoriesId;
+    }
+
+    public void setCategoriesId(Integer categoriesId) {
+        this.categoriesId = categoriesId;
+    }
+
+    public Integer getSysMusicScoreId() {
+        return sysMusicScoreId;
+    }
+
+    public void setSysMusicScoreId(Integer sysMusicScoreId) {
+        this.sysMusicScoreId = sysMusicScoreId;
+    }
+
     public Integer getCreateUserId() {
         return createUserId;
     }

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

@@ -0,0 +1,17 @@
+package com.ym.mec.biz.service;
+
+
+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);
+
+    List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
+
+    List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
+}

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

@@ -0,0 +1,13 @@
+package com.ym.mec.biz.service;
+
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
+import com.ym.mec.common.service.BaseService;
+
+import java.util.List;
+
+public interface SysMusicScoreCategoriesService extends BaseService<Integer, SysMusicScoreCategories> {
+
+    List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo);
+}

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

@@ -0,0 +1,15 @@
+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.common.service.BaseService;
+
+public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
+
+    void updateMusicScore(MusicScoreDto examSongDto);
+
+    void add(MusicScoreDto examSongDto);
+
+    void del(Integer id);
+}

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

@@ -2770,23 +2770,23 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
 			CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
+//
+//			BigDecimal teacherSalary=BigDecimal.ZERO;
 
-			BigDecimal teacherSalary=BigDecimal.ZERO;
-
-			Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId());
-
-			ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupCourseAdjustInfo.getVipGroupId().intValue(), courseSchedules.get(0).getActualTeacherId());
-
-			if(Objects.nonNull(classGroupTeacherSalary)){
-				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
-			}
+//			Map<String, BigDecimal> salaryMap = vipGroupService.countVipGroupPredictFee(vipGroup, vipGroup.getUserId());
+//
+//			ClassGroupTeacherSalary classGroupTeacherSalary = classGroupTeacherSalaryDao.findByVipGoupAndTeacher(vipGroupCourseAdjustInfo.getVipGroupId().intValue(), courseSchedules.get(0).getActualTeacherId());
+//
+//			if(Objects.nonNull(classGroupTeacherSalary)){
+//				teacherSalary=vipGroupCourseAdjustInfo.getTeachMode().equals(TeachModeEnum.OFFLINE)?salaryMap.get("offlineTeacherSalary"):salaryMap.get("onlineTeacherSalary");
+//			}
 
 			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
 				vipGroup.setCoursesExpireDate(courseSchedule.getEndClassTime());
 				vipGroupDao.update(vipGroup);
 			}
 
-			courseScheduleTeacherSalaryDao.batchUpdateCourseSalarys(courseScheduleIds, teacherSalary);
+//			courseScheduleTeacherSalaryDao.batchUpdateCourseSalarys(courseScheduleIds, teacherSalary);
 
 		}
 

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

@@ -0,0 +1,59 @@
+package com.ym.mec.biz.service.impl;
+
+
+import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
+import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreAccompaniment> implements SysMusicScoreAccompanimentService {
+	
+	@Autowired
+	private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
+
+	@Override
+	public BaseDAO<Integer, SysMusicScoreAccompaniment> getDAO() {
+		return sysMusicScoreAccompanimentDao;
+	}
+
+	@Override
+	public void updateAcc(SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
+		SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentDao.get(sysMusicScoreAccompaniment.getId());
+		if(accompaniment == null){
+			throw new BizException("操作失败：伴奏信息不存在");
+		}
+		List<Integer> idList = new ArrayList<>();
+		idList.add(accompaniment.getId());
+		List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(accompaniment.getExamSongId(),idList);
+		if(subjectIds.size() > 0 && subjectIds.contains(accompaniment.getId())){
+			throw new BizException("操作失败：请勿提交重复的伴奏声部");
+		}
+		sysMusicScoreAccompanimentDao.update(sysMusicScoreAccompaniment);
+	}
+
+	@Override
+	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
+		Map<String, Object> params = new HashMap<>();
+		MapUtil.populateMap(params, queryInfo);
+		return sysMusicScoreAccompanimentDao.queryPage(params);
+	}
+
+	@Override
+	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/java/com/ym/mec/biz/service/impl/SysMusicScoreCategoriesServiceImpl.java

@@ -0,0 +1,54 @@
+package com.ym.mec.biz.service.impl;
+
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.auth.api.entity.SysMenu;
+import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
+import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class SysMusicScoreCategoriesServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreCategories> implements SysMusicScoreCategoriesService {
+	
+	@Autowired
+	private SysMusicScoreCategoriesDao sysMusicScoreCategoriesDao;
+
+	@Override
+	public BaseDAO<Integer, SysMusicScoreCategories> getDAO() {
+		return sysMusicScoreCategoriesDao;
+	}
+
+
+	@Override
+	public List<SysMusicScoreCategories> queryTree(MusicScoreQueryInfo menuQueryInfo) {
+		List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesDao.findByParentId(menuQueryInfo.getParentId());
+		List<SysMusicScoreCategories> scoreCategoriesAllList = sysMusicScoreCategoriesDao.findByParentId(null);
+		for (SysMusicScoreCategories categories : scoreCategories) {
+			categories = getTree(categories,scoreCategoriesAllList);
+		}
+		return scoreCategories;
+	}
+
+	private SysMusicScoreCategories getTree(SysMusicScoreCategories categories,List<SysMusicScoreCategories> scoreCategoriesAllList){
+		//得到根节点对象
+		//获取子节点list
+		List<SysMusicScoreCategories> scoreCategories = scoreCategoriesAllList.stream().filter(e->e.getParentId().equals(categories.getId())).collect(Collectors.toList());
+		//如果存在子节点
+		if(scoreCategories != null && scoreCategories.size() > 0) {
+			//将子节点list放入父节点对象
+			categories.setSysMusicScoreCategoriesList(scoreCategories);
+			//遍历子节点....
+			for (SysMusicScoreCategories sysMenu : scoreCategories) {
+				getTree(sysMenu,scoreCategoriesAllList);
+			}
+		}
+		return categories;
+	}
+}

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

@@ -0,0 +1,97 @@
+package com.ym.mec.biz.service.impl;
+
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
+import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
+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.service.SysMusicScoreService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicScore> implements SysMusicScoreService {
+	
+	@Autowired
+	private SysMusicScoreDao sysMusicScoreDao;
+	@Autowired
+	private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
+	@Autowired
+	private SysUserFeignService sysUserFeignService;
+
+	@Override
+	public BaseDAO<Integer, SysMusicScore> getDAO() {
+		return sysMusicScoreDao;
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void updateMusicScore(MusicScoreDto examSongDto) {
+		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+		sysMusicScoreDao.update(sysMusicScore);
+		List<Integer> delExamSongAccompanimentIds = examSongDto.getDelExamSongAccompanimentIds();
+		if(delExamSongAccompanimentIds != null && delExamSongAccompanimentIds.size() > 0){
+			sysMusicScoreAccompanimentDao.batchDel(delExamSongAccompanimentIds);
+		}
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
+			List<Integer> subjectIdList = sysMusicScoreAccompaniments.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
+			subjectIdList.removeAll(Collections.singleton(null));
+			if(subjectIdList.size() > 0){
+				List<Integer> idList = sysMusicScoreAccompaniments.stream().map(e -> e.getId()).collect(Collectors.toList());
+				List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(sysMusicScore.getId(),idList);
+				int subjectSize = subjectIds.size() + subjectIdList.size();
+				subjectIdList.addAll(subjectIds);
+				int size = new HashSet<>(subjectIdList).size();
+				if(size < subjectSize){
+					throw new BizException("操作失败：请勿提交重复的伴奏声部");
+				}
+			}
+			//获取需要修改的伴奏
+			List<SysMusicScoreAccompaniment> updateCollect = sysMusicScoreAccompaniments.stream().filter(e -> e.getId() != null).collect(Collectors.toList());
+			if(updateCollect.size() > 0){
+				sysMusicScoreAccompanimentDao.batchUpdate(updateCollect);
+			}
+			//获取需要新增的伴奏
+			List<SysMusicScoreAccompaniment> addCollect = sysMusicScoreAccompaniments.stream().filter(e -> e.getId() == null).collect(Collectors.toList());
+			if(addCollect.size() > 0){
+				sysMusicScoreAccompanimentDao.batchInsert(addCollect,sysMusicScore.getId());
+			}
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void add(MusicScoreDto examSongDto) {
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if(sysUser == null){
+			throw new BizException("请登录");
+		}
+		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+		sysMusicScore.setCreateUserId(sysUser.getId());
+		sysMusicScoreDao.insert(sysMusicScore);
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
+			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId());
+		}
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void del(Integer id) {
+		sysMusicScoreDao.delete(id);
+		sysMusicScoreAccompanimentDao.deleteBySongId(id);
+	}
+}

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

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment" id="SysMusicScoreAccompaniment">
+		<result column="id_" property="id" />
+		<result column="exam_song_id_" property="examSongId" />
+		<result column="subject_id_" property="subjectId" />
+		<result column="subject_name_" property="subjectName" />
+		<result column="mp3_url_" property="mp3Url" />
+		<result column="xml_url_" property="xmlUrl" />
+		<result column="name_" property="examSongName" />
+		<result column="categories_name_" property="categoriesName" />
+		<result column="categories_id_" property="categoriesId" />
+		<result column="type_" property="type" />
+		<result column="url_" property="url" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="speed_" property="speed" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<delete id="deleteBySongId">
+		UPDATE sys_music_score_accompaniment SET del_flag_ = 1,update_time_ = NOW() WHERE exam_song_id_ = #{id}
+	</delete>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysMusicScoreAccompaniment" >
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
+		WHERE sesa.id_ = #{id}
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysMusicScoreAccompaniment">
+		SELECT * FROM sys_music_score_accompaniment ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_)
+		VALUES(#{examSongId},#{subjectId},#{mp3Url},#{speed},#{xmlUrl},NOW(),NOW())
+	</insert>
+    <insert id="batchInsert">
+		INSERT INTO sys_music_score_accompaniment (exam_song_id_,subject_id_,mp3_url_,speed_,xml_url_,create_time_,update_time_)
+		VALUES
+		<foreach collection="sysMusicScoreAccompaniments" item="item"  separator=",">
+			(#{sysMusicScoreId},#{item.subjectId},#{item.mp3Url},#{item.speed},#{item.xmlUrl},NOW(),NOW())
+		</foreach>
+	</insert>
+
+    <!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment">
+		UPDATE sys_music_score_accompaniment
+		<set>
+		<if test="subjectId != null">
+			subject_id_ = #{subjectId},
+		</if>
+		<if test="speed != null">
+			speed_ = #{speed},
+		</if>
+		<if test="xmlUrl != null">
+			xml_url_ = #{xmlUrl},
+		</if>
+		<if test="examSongId != null">
+			exam_song_id_ = #{examSongId},
+		</if>
+		<if test="mp3Url != null">
+			mp3_url_ = #{mp3Url},
+		</if>
+		update_time_ = NOW()
+	</set>WHERE id_ = #{id}
+	</update>
+	<update id="batchDel">
+		UPDATE sys_music_score_accompaniment SET del_flag_ = 1,update_time_ = NOW() WHERE id_ IN
+		<foreach collection="delExamSongAccompanimentIds" item="item" open="(" close=")" separator=",">
+			#{item}
+		</foreach>
+	</update>
+	<update id="batchUpdate">
+		<foreach collection="sysMusicScoreAccompaniments" item="item" separator=";">
+			UPDATE sys_music_score_accompaniment
+			<set>
+				<if test="item.speed != null">
+					speed_ = #{item.speed},
+				</if>
+				<if test="item.subjectId != null">
+					subject_id_ = #{item.subjectId},
+				</if>
+				<if test="item.xmlUrl != null">
+					xml_url_ = #{item.xmlUrl},
+				</if>
+				<if test="item.examSongId != null">
+					exam_song_id_ = #{item.examSongId},
+				</if>
+				<if test="item.mp3Url != null">
+					mp3_url_ = #{item.mp3Url},
+				</if>
+				update_time_ = NOW()
+			</set> WHERE id_ = #{item.id}
+		</foreach>
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<update id="delete" >
+		UPDATE sys_music_score_accompaniment SET del_flag_ = 1,update_time_ = NOW() WHERE id_ = #{id}
+	</update>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
+		SELECT sesa.*,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
+		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
+		<where>
+			sesa.del_flag_ = 0
+			<if test="subjectId != null">
+				AND sesa.subject_id_ = #{subjectId}
+			</if>
+			<if test="sysMusicScoreId != null">
+				AND sesa.exam_song_id_ = #{sysMusicScoreId}
+			</if>
+		</where>
+		ORDER BY sesa.id_ DESC
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM sys_music_score_accompaniment
+	</select>
+	<select id="findSubjectByMusicScoreId" resultType="java.lang.Integer">
+		SELECT subject_id_ FROM sys_music_score_accompaniment
+		<where>
+			del_flag_ = 0
+			<if test="sysMusicScoreId != null">
+				AND exam_song_id_ = #{sysMusicScoreId}
+			</if>
+			<if test="idList != null and idList.size > 0">
+				AND id_ NOT IN
+				<foreach collection="idList" open="(" close=")" item="item" separator=",">
+					#{item}
+				</foreach>
+			</if>
+		</where>
+	</select>
+	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_
+		FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
+		LEFT JOIN subject s ON s.id_ = sesa.subject_id_
+		<include refid="queryPageSql"/>
+	</select>
+
+	<select id="findAccCount" resultType="java.lang.Integer">
+		SELECT COUNT(DISTINCT sesa.id_) FROM sys_music_score_accompaniment sesa
+		LEFT JOIN sys_music_score ses ON ses.id_ = sesa.exam_song_id_
+		<include refid="queryPageSql"/>
+	</select>
+
+	<sql id="queryPageSql">
+		<where>
+			sesa.del_flag_ = 0
+			<if test="search != null and search != ''">
+				AND (sesa.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
+			</if>
+			<if test="sysMusicScoreId != null">
+				AND sesa.exam_song_id_ = #{sysMusicScoreId}
+			</if>
+			<if test="subjectId != null">
+				AND sesa.subject_id_ = #{subjectId}
+			</if>
+			<if test="type != null and type == 'COMMON'">
+				AND ses.type_ = #{type}
+			</if>
+			<if test="type != null and type == 'ALL'">
+				<if test="createUserId != null">
+					AND (ses.type_ = 'COMMON' OR (ses.create_user_id_ = #{createUserId} AND ses.type_ = 'PERSON'))
+				</if>
+			</if>
+			<if test="type != null and type == 'PERSON'">
+				<if test="createUserId != null">
+					AND ses.type_ = #{type} AND ses.create_user_id_ = #{createUserId}
+				</if>
+				<if test="createUserId == null">
+					AND ses.type_ = #{type}
+				</if>
+			</if>
+			<if test="type == null or type == ''">
+				<if test="createUserId != null">
+					AND ses.create_user_id_ = #{createUserId}
+				</if>
+			</if>
+		</where>
+	</sql>
+</mapper>

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.SysMusicScoreCategories" id="SysMusicScoreCategories">
+		<result column="id_" property="id" />
+		<result column="parent_id_" property="parentId" />
+		<result column="name_" property="name" />
+		<result column="cover_img_" property="coverImg" />
+		<result column="operator_id_" property="operatorId" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysMusicScoreCategories" >
+		SELECT * FROM sys_music_score_categories WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysMusicScoreCategories">
+		SELECT * FROM sys_music_score_categories ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreCategories" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO sys_music_score_categories (id_,parent_id_,name_,cover_img_,operator_id_,create_time_,update_time_)
+		VALUES(#{id},#{parentId},#{name},#{coverImg},#{operatorId},#{createTime},#{updateTime})
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScoreCategories">
+		UPDATE sys_music_score_categories <set>
+		<if test="parentId != null">
+		parent_id_ = #{parentId},
+		</if>
+		<if test="operatorId != null">
+		operator_id_ = #{operatorId},
+		</if>
+		<if test="coverImg != null">
+		cover_img_ = #{coverImg},
+		</if>
+		<if test="id != null">
+		id_ = #{id},
+		</if>
+		<if test="updateTime != null">
+		update_time_ = #{updateTime},
+		</if>
+		<if test="name != null">
+		name_ = #{name},
+		</if>
+		<if test="createTime != null">
+		create_time_ = #{createTime},
+		</if>
+		</set> WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete" >
+		DELETE FROM sys_music_score_categories WHERE id_ = #{id} 
+	</delete>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysMusicScoreCategories" parameterType="map">
+		SELECT * FROM sys_music_score_categories ORDER BY id_
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM sys_music_score_categories
+	</select>
+	<select id="findByParentId" resultMap="SysMusicScoreCategories">
+		SELECT sm.* FROM sys_music_score_categories sm
+		<include refid="queryTree"/>
+		ORDER BY sm.id_ DESC
+	</select>
+	<sql id="queryTree">
+		<where>
+			<if test="parentId != null">
+				AND sm.parent_id_ = #{parentId}
+			</if>
+		</where>
+	</sql>
+</mapper>

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!--
+这个文件是自动生成的。
+不要修改此文件。所有改动将在下次重新自动生成时丢失。
+-->
+<mapper namespace="com.ym.mec.biz.dal.dao.SysMusicScoreDao">
+	
+	<resultMap type="com.ym.mec.biz.dal.entity.SysMusicScore" id="SysMusicScore">
+		<result column="id_" property="id" />
+		<result column="name_" property="name" />
+		<result column="categories_name_" property="categoriesName" />
+		<result column="categories_id_" property="categoriesId" />
+		<result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+		<result column="subject_ids_" property="subjectIds" />
+		<result column="speed_" property="speed" />
+		<result column="url_" property="url" />
+		<result column="create_user_id_" property="createUserId" />
+		<result column="create_user_name_" property="createUserName" />
+		<result column="del_flag_" property="delFlag" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+	
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="SysMusicScore" >
+		SELECT * FROM sys_music_score WHERE id_ = #{id} 
+	</select>
+	
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="SysMusicScore">
+		SELECT * FROM sys_music_score ORDER BY id_
+	</select>
+	
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO sys_music_score (music_score_categories_id_,name_,type_,speed_,url_,create_user_id_,update_time_,create_time_)
+		VALUES(#{musicScoreCategoriesId},#{name},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{speed},#{url},#{createUserId},NOW(),NOW())
+	</insert>
+	
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SysMusicScore">
+		UPDATE sys_music_score <set>
+		<if test="delFlag != null">
+			del_flag_ = #{delFlag},
+		</if>
+		<if test="musicScoreCategoriesId != null">
+			music_score_categories_id_ = #{musicScoreCategoriesId},
+		</if>
+		<if test="createUserId != null">
+			create_user_id_ = #{createUserId},
+		</if>
+		<if test="url != null and url != ''">
+			url_ = #{url},
+		</if>
+		<if test="subjectIds != null and subjectIds != ''">
+			subject_ids_ = #{subjectIds},
+		</if>
+		<if test="type != null">
+			type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+		</if>
+		<if test="name != null and name != ''">
+			name_ = #{name},
+		</if>
+		<if test="speed != null">
+			speed_ = #{speed},
+		</if>
+		<if test="updateTime != null">
+			update_time_ = NOW()
+		</if>
+	</set>
+		WHERE id_ = #{id}
+	</update>
+	
+	<!-- 根据主键删除一条记录 -->
+	<update id="delete" >
+		UPDATE sys_music_score SET del_flag_ = 1 WHERE id_ = #{id}
+	</update>
+	
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="SysMusicScore" parameterType="map">
+		SELECT ses.*,su.real_name_ create_user_name_,smsc.name_ categories_name_,smsc.id_ categories_id_
+		FROM sys_music_score ses
+		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"/>
+		GROUP BY ses.id_
+		ORDER BY ses.id_ DESC
+		<include refid="global.limit"/>
+	</select>
+	
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(0) FROM sys_music_score ses
+		<include refid="queryPageSql"/>
+	</select>
+	<sql id="queryPageSql">
+		<where>
+			ses.del_flag_ = 0
+			<if test="categoriesId != null">
+				AND ses.music_score_categories_id_ = #{categoriesId}
+			</if>
+			<if test="search != null and search != ''">
+				AND (ses.id_ = #{search} OR ses.name_ LIKE CONCAT('%',#{search},'%'))
+			</if>
+			<if test="type != null and type == 'COMMON'">
+				AND ses.type_ = #{type}
+			</if>
+			<if test="type != null and type == 'ALL'">
+				<if test="createUserId != null">
+					AND (ses.type_ = 'COMMON' OR (ses.create_user_id_ = #{createUserId} AND ses.type_ = 'PERSON'))
+				</if>
+			</if>
+			<if test="type != null and type == 'PERSON'">
+				<if test="createUserId != null">
+					AND ses.type_ = #{type} AND ses.create_user_id_ = #{createUserId}
+				</if>
+				<if test="createUserId == null">
+					AND ses.type_ = #{type}
+				</if>
+			</if>
+			<if test="type == null or type == ''">
+				<if test="createUserId != null">
+					AND ses.create_user_id_ = #{createUserId}
+				</if>
+			</if>
+		</where>
+	</sql>
+</mapper>

mec-common/audit-log/src/main/java/com/yonge/log/dal/model/AuditLog.java

@@ -18,6 +18,8 @@ public class AuditLog implements Serializable {
 
 	private String username;
 
+	private Integer userId;
+
 	private String operateName;
 
 	private String interfaceUrl;
@@ -32,6 +34,14 @@ public class AuditLog implements Serializable {
 
 	private String service;
 
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
 	public String getService() {
 		return service;
 	}

mec-common/audit-log/src/main/java/com/yonge/log/interceptor/AuditLogInterceptor.java

@@ -1,15 +1,12 @@
 package com.yonge.log.interceptor;
 
 import java.io.IOException;
-import java.lang.reflect.Array;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.*;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -17,7 +14,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
 import com.ym.mec.util.json.JsonUtil;
 import com.ym.mec.util.web.WebUtil;
 import com.yonge.log.dal.model.AuditLog;
@@ -37,6 +33,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 
 	private String username;
 
+	private Integer userId;
+
 	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	private static List<String> ignoreLogUrl;
@@ -80,6 +78,8 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 				ignoreLogUrl.add("find");
 				ignoreLogUrl.add("list");
 				ignoreLogUrl.add("detail");
+				ignoreLogUrl.add("hasindexerrdata");
+				ignoreLogUrl.add("newindex");
 			}
 			for (String e : ignoreLogUrl) {
 				if(substring.contains(e)){
@@ -108,12 +108,13 @@ public class AuditLogInterceptor extends HandlerInterceptorAdapter {
 		}
 		// 操作人
 		auditLog.setUsername(username);
+		auditLog.setUserId(userId);
 		auditLog.setOperateTime(sdf.format(new Date()));
 		auditLogService.insert(auditLog);
 	}
 
-	public void setUsername(String username) {
+	public void setUsername(String username,Integer userId) {
 		this.username = username;
+		this.userId = userId;
 	}
-
 }

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupRegisterController.java

@@ -6,11 +6,13 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
 import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.date.DateUtil;
 
 import io.swagger.annotations.Api;
@@ -19,6 +21,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -62,6 +65,11 @@ public class MusicGroupRegisterController extends BaseController {
             return succeed(studentRegistrationService.updateStudent(studentRegistration));
         }
 
+        StudentRegistration hasReg = studentRegistrationService.getByPhoneAndMusicGroupId(studentRegistration.getMusicGroupId(), studentRegistration.getParentsPhone());
+        if (hasReg != null && hasReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT) {
+            return succeed(hasReg);
+        }
+
         if (musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY)) {
             studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
         } else {

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -0,0 +1,25 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScoreAccompaniment")
+@Api(tags = "曲库服务")
+@RestController
+public class SysMusicScoreAccompanimentController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.ym.mec.student.controller;
+
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScore")
+@Api(tags = "曲库")
+@RestController
+public class SysMusicScoreController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreService sysMusicScoreService;
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        queryInfo.setType("COMMON");
+        return succeed(sysMusicScoreService.queryPage(queryInfo));
+    }
+}

mec-student/src/main/java/com/ym/mec/student/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

mec-teacher/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -0,0 +1,54 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScoreAccompaniment")
+@Api(tags = "曲库服务")
+@RestController
+public class SysMusicScoreAccompanimentController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    public Object update(@RequestBody SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
+        sysMusicScoreAccompanimentService.updateAcc(sysMusicScoreAccompaniment);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    public Object del(Integer id) {
+        sysMusicScoreAccompanimentService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        String type = queryInfo.getType();
+        if(StringUtils.isEmpty(type)){
+            queryInfo.setType("ALL");
+        }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        queryInfo.setCreateUserId(sysUser.getId());
+        return succeed(sysMusicScoreAccompanimentService.queryAccPage(queryInfo));
+    }
+}

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

@@ -0,0 +1,55 @@
+package com.ym.mec.teacher.controller;
+
+import com.ym.mec.auth.api.client.SysUserFeignService;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScore")
+@Api(tags = "曲库")
+@RestController
+public class SysMusicScoreController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreService sysMusicScoreService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    public Object add(@RequestBody MusicScoreDto examSongDto) {
+        sysMusicScoreService.add(examSongDto);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    public Object del(Integer id) {
+        sysMusicScoreService.del(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        String type = queryInfo.getType();
+        if(StringUtils.isEmpty(type)){
+            queryInfo.setType("ALL");
+        }
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            throw new BizException("请登录");
+        }
+        queryInfo.setCreateUserId(sysUser.getId());
+        return succeed(sysMusicScoreService.queryPage(queryInfo));
+    }
+}

mec-teacher/src/main/java/com/ym/mec/teacher/interceptor/OperationLogInterceptor.java

@@ -23,7 +23,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}

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

@@ -76,7 +76,7 @@ public class InspectionItemPlanConclusionController extends BaseController {
             String[] header2 = {"处理方式", planInfo.getMemo(), "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
             String[] header3 = {"", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""};
             String[] header4 = {"巡查项目", "课前管理", "", "", "", "", "课中管理", "", "", "", "", "", "", "课后管理", "", ""};
-            String[] header5 = {"", "老师是否提前准备板书（本课内容、作业）", "老师是否佩戴工牌", "老师是否仪容仪表整洁", "老师是否携带乐器", "老师是否携带教学资料、设备", "老师是否合理安排学员座位", "乐器箱包、书包是否摆放整齐", "课堂纪律是否保持良好", "老师是否全程站立教学", "老师是否全程使用节拍器或教学音频", "是否发现学员需要更换新乐器", "老师是否将上课照片/视频发送到声部群", "老师是否保持教室环境卫生", "老师是否关好所有电源、门窗", "老师是否有序组织学员放学"};
+            String[] header5 = {"", "老师是否提前准备板书（本课内容、作业）", "老师是否佩戴工牌", "老师是否仪容仪表整洁", "老师是否携带乐器", "老师是否携带教学资料、设备", "老师是否合理安排学员座位", "乐器箱包、书包是否摆放整齐", "课堂纪律是否保持良好", "老师是否全程站立教学", "老师是否全程使用节拍器或教学音频", "未发现私换乐器", "老师是否将上课照片/视频发送到声部群", "老师是否保持教室环境卫生", "老师是否关好所有电源、门窗", "老师是否有序组织学员放学"};
 
             List<String[]> headers = new LinkedList<>();
             headers.add(header);

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

@@ -0,0 +1,44 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreAccompanimentService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScoreAccompaniment")
+@Api(tags = "曲库服务")
+@RestController
+public class SysMusicScoreAccompanimentController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/update')")
+    public Object update(@RequestBody SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
+        sysMusicScoreAccompanimentService.updateAcc(sysMusicScoreAccompaniment);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del/{id}")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/del')")
+    public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
+        sysMusicScoreAccompanimentService.delete(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/queryPage')")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreAccompanimentService.queryAll(queryInfo));
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.auth.api.dto.MusicScoreQueryInfo;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScoreCategories")
+@Api(tags = "曲库分类服务")
+@RestController
+public class SysMusicScoreCategoriesController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreCategoriesService sysMusicScoreCategoriesService;
+
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryPage')")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "树状列表")
+    @GetMapping("/queryTree")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreCategories/queryTree')")
+    public Object queryTree(MusicScoreQueryInfo queryInfo) {
+        return succeed(sysMusicScoreCategoriesService.queryTree(queryInfo));
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package com.ym.mec.web.controller;
+
+import com.ym.mec.biz.dal.dto.MusicScoreDto;
+import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
+import com.ym.mec.biz.service.SysMusicScoreService;
+import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+@RequestMapping("sysMusicScore")
+@Api(tags = "曲库")
+@RestController
+public class SysMusicScoreController extends BaseController {
+
+    @Autowired
+    private SysMusicScoreService sysMusicScoreService;
+
+    @ApiOperation(value = "修改")
+    @PostMapping("/update")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/update')")
+    public Object update(@RequestBody MusicScoreDto examSongDto) {
+        sysMusicScoreService.updateMusicScore(examSongDto);
+        return succeed();
+    }
+
+    @ApiOperation(value = "新增")
+    @PostMapping("/add")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/add')")
+    public Object add(@RequestBody MusicScoreDto examSongDto) {
+        sysMusicScoreService.add(examSongDto);
+        return succeed();
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/del')")
+    public Object del(Integer id) {
+        sysMusicScoreService.del(id);
+        return succeed();
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("/queryPage")
+    @PreAuthorize("@pcs.hasPermissions('sysMusicScore/queryPage')")
+    public Object queryPage(SysExamSongQueryInfo queryInfo) {
+        return succeed(sysMusicScoreService.queryPage(queryInfo));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/interceptor/OperationLogInterceptor.java

@@ -25,7 +25,7 @@ public class OperationLogInterceptor extends AuditLogInterceptor {
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ServletException, IOException {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser != null) {
-			setUsername(sysUser.getRealName());
+			setUsername(sysUser.getRealName(),sysUser.getId());
 		}
 		return true;
 	}