老师新增伴奏

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

@@ -7,9 +7,9 @@ import com.ym.mec.common.service.BaseService;
 
 public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore> {
 
-    void updateMusicScore(MusicScoreDto examSongDto);
+    void updateMusicScore(MusicScoreDto musicScoreDto);
 
-    void add(MusicScoreDto examSongDto);
+    void add(MusicScoreDto musicScoreDto);
 
     void del(Integer id);
 }

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

@@ -38,14 +38,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void updateMusicScore(MusicScoreDto examSongDto) {
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+	public void updateMusicScore(MusicScoreDto musicScoreDto) {
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScoreDao.update(sysMusicScore);
-		List<Integer> delExamSongAccompanimentIds = examSongDto.getDelExamSongAccompanimentIds();
+		List<Integer> delExamSongAccompanimentIds = musicScoreDto.getDelExamSongAccompanimentIds();
 		if(delExamSongAccompanimentIds != null && delExamSongAccompanimentIds.size() > 0){
 			sysMusicScoreAccompanimentDao.batchDel(delExamSongAccompanimentIds);
 		}
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			List<Integer> subjectIdList = sysMusicScoreAccompaniments.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
 			subjectIdList.removeAll(Collections.singleton(null));
@@ -74,15 +74,15 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void add(MusicScoreDto examSongDto) {
+	public void add(MusicScoreDto musicScoreDto) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
 			throw new BizException("请登录");
 		}
-		SysMusicScore sysMusicScore = examSongDto.getSysMusicScore();
+		SysMusicScore sysMusicScore = musicScoreDto.getSysMusicScore();
 		sysMusicScore.setCreateUserId(sysUser.getId());
 		sysMusicScoreDao.insert(sysMusicScore);
-		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = examSongDto.getSysMusicScoreAccompaniments();
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = musicScoreDto.getSysMusicScoreAccompaniments();
 		if(sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0){
 			sysMusicScoreAccompanimentDao.batchInsert(sysMusicScoreAccompaniments,sysMusicScore.getId());
 		}

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

@@ -3,6 +3,7 @@ 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.enums.ExamSongTypeEnum;
 import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
@@ -26,8 +27,9 @@ public class SysMusicScoreController extends BaseController {
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        musicScoreDto.getSysMusicScore().setType(ExamSongTypeEnum.PERSON);
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }
 

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

@@ -21,16 +21,16 @@ public class SysMusicScoreController extends BaseController {
     @ApiOperation(value = "修改")
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/update')")
-    public Object update(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.updateMusicScore(examSongDto);
+    public Object update(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.updateMusicScore(musicScoreDto);
         return succeed();
     }
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/add')")
-    public Object add(@RequestBody MusicScoreDto examSongDto) {
-        sysMusicScoreService.add(examSongDto);
+    public Object add(@RequestBody MusicScoreDto musicScoreDto) {
+        sysMusicScoreService.add(musicScoreDto);
         return succeed();
     }