瀏覽代碼

fix:曲目加声部code

liujunchi 2 年之前
父節點
當前提交
e7a8d8f1ed

+ 2 - 6
cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/TeacherEarningTask.java

@@ -4,13 +4,9 @@ import com.yonge.cooleshow.api.feign.AdminFeignService;
 import com.yonge.cooleshow.task.core.BaseTask;
 import com.yonge.cooleshow.task.core.TaskException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-/**
- * Description
- *
- * @author liujunchi
- * @date 2022-05-17
- */
+@Service
 public class TeacherEarningTask extends BaseTask {
 
 

+ 11 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -37,6 +37,17 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("声部名")
     private String subjectNames;
 
+    @ApiModelProperty("声部code")
+    private String code;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getUserAvatar() {
         return userAvatar;
     }

+ 3 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -178,11 +178,12 @@
         ,su.avatar_ as userAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s
-        where find_in_set(s.id_,t.music_subject_)  and s.del_flag_ = 0) as subjectNames
+        ,s2.name_ as subjectNames
+        ,s2.code_ as code
         FROM music_sheet t
         left join music_sheet_accompaniment msa on msa.music_sheet_id_ = t.id_
         left join sys_user su on t.create_by_ = su.id_
+        left join subject s2 on t.music_subject_ = s2.id_
         where t.id_ = #{id}
          order by  msa.sort_number_
     </select>