Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -154,10 +154,21 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
     public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
-        if (id == null) {
+        if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.TEACHER));
+        MusicSheet musicSheet = musicSheetService.getById(id);
+        if (musicSheet == null) {
+            return failed("曲目不存在");
+        }
+        if (YesOrNoEnum.YES.equals(musicSheet.getState())) {
+            musicSheet.setState(YesOrNoEnum.NO);
+        } else {
+            musicSheet.setState(YesOrNoEnum.YES);
+        }
+        musicSheetService.updateById(musicSheet);
+        return succeed(true);
+//        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.TEACHER));
     }
 
     /**

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
@@ -160,7 +161,18 @@ public class MusicSheetController extends BaseController {
         if (StringUtil.isEmpty(id)) {
             return failed("参数不能为空");
         }
-        return status(musicSheetService.state(id,"", ClientEnum.TEACHER));
+        MusicSheet musicSheet = musicSheetService.getById(id);
+        if (musicSheet == null) {
+            return failed("曲目不存在");
+        }
+        if (YesOrNoEnum.YES.equals(musicSheet.getState())) {
+            musicSheet.setState(YesOrNoEnum.NO);
+        } else {
+            musicSheet.setState(YesOrNoEnum.YES);
+        }
+        musicSheetService.updateById(musicSheet);
+        return succeed(true);
+//        return status(musicSheetService.state(id,"", ClientEnum.TEACHER));
     }
 
     @ApiOperation(value = "关联的曲目列表")