liujunchi 3 роки тому
батько
коміт
b407782704

+ 6 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicTagServiceImpl.java

@@ -60,6 +60,12 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
          musicTagVoIPage.getRecords()
                  .forEach(musicTagVo -> {
                      List<MusicTagVo> childrenList = musicTagMap.get(musicTagVo.getId().toString());
+                     childrenList.forEach(children -> {
+                         musicTagVo.setEnablePlatformMusicSheetNum(musicTagVo.getEnableTeacherMusicSheetNum() + children.getEnablePlatformMusicSheetNum());
+                         musicTagVo.setEnableTeacherMusicSheetNum(musicTagVo.getEnableTeacherMusicSheetNum() + children.getEnableTeacherMusicSheetNum());
+                         musicTagVo.setMusicPlatformSheetNum(musicTagVo.getMusicPlatformSheetNum() + children.getMusicPlatformSheetNum());
+                         musicTagVo.setMusicTeacherSheetNum(musicTagVo.getMusicTeacherSheetNum() + children.getMusicTeacherSheetNum());
+                     });
                      // 如果没有按名称/编号查询 或 父级标签包含了名称/编号 , 展示所有子集 标签列表子集收起
                      if (StringUtil.isBlank(query.getIdAndName())
                              || musicTagVo.getName().contains(query.getIdAndName())

+ 47 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicTagVo.java

@@ -25,6 +25,53 @@ public class MusicTagVo extends MusicTag{
 	@ApiModelProperty("二级标签")
 	private List<MusicTagVo> children = new ArrayList<>();
 
+
+
+	@ApiModelProperty("平台乐谱启用数")
+	private Integer enablePlatformMusicSheetNum = 0;
+
+	@ApiModelProperty("平台乐谱数")
+	private Integer musicPlatformSheetNum= 0;
+
+
+	@ApiModelProperty("老师乐谱启用数")
+	private Integer enableTeacherMusicSheetNum= 0;
+
+	@ApiModelProperty("老师乐谱数")
+	private Integer musicTeacherSheetNum= 0;
+
+	public Integer getEnablePlatformMusicSheetNum() {
+		return enablePlatformMusicSheetNum;
+	}
+
+	public void setEnablePlatformMusicSheetNum(Integer enablePlatformMusicSheetNum) {
+		this.enablePlatformMusicSheetNum = enablePlatformMusicSheetNum;
+	}
+
+	public Integer getMusicPlatformSheetNum() {
+		return musicPlatformSheetNum;
+	}
+
+	public void setMusicPlatformSheetNum(Integer musicPlatformSheetNum) {
+		this.musicPlatformSheetNum = musicPlatformSheetNum;
+	}
+
+	public Integer getEnableTeacherMusicSheetNum() {
+		return enableTeacherMusicSheetNum;
+	}
+
+	public void setEnableTeacherMusicSheetNum(Integer enableTeacherMusicSheetNum) {
+		this.enableTeacherMusicSheetNum = enableTeacherMusicSheetNum;
+	}
+
+	public Integer getMusicTeacherSheetNum() {
+		return musicTeacherSheetNum;
+	}
+
+	public void setMusicTeacherSheetNum(Integer musicTeacherSheetNum) {
+		this.musicTeacherSheetNum = musicTeacherSheetNum;
+	}
+
 	public YesOrNoEnum getOpen() {
 		return open;
 	}

+ 5 - 1
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicTagMapper.xml

@@ -80,7 +80,11 @@
 	<select id="getChildrenByParentIdList" resultType="com.yonge.cooleshow.biz.dal.vo.MusicTagVo">
         SELECT
         <include refid="baseColumns" />,
-        su.username_ as updateName
+        su.username_ as updateName,
+        (select count(1) from music_sheet ms where find_in_set(t.id_,ms.music_tag_) and ms.del_flag_ = 0 and  ms.state_ = 1 and ms.source_type_ = 'PLATFORM') as enablePlatformMusicSheetNum,
+        (select count(1) from music_sheet ms where find_in_set(t.id_,ms.music_tag_) and ms.del_flag_ = 0  and ms.source_type_ = 'PLATFORM') as musicPlatformSheetNum,
+        (select count(1) from music_sheet ms where find_in_set(t.id_,ms.music_tag_) and ms.del_flag_ = 0 and ms.source_type_ = 'TEACHER' and ms.audit_status_ = 'PASS') as musicTeacherSheetNum,
+        (select count(1) from music_sheet ms where find_in_set(t.id_,ms.music_tag_) and ms.del_flag_ = 0  and ms.source_type_ = 'TEACHER' and ms.state_ = 1 and ms.audit_status_ = 'PASS') as enableTeacherMusicSheetNum
         FROM music_tag t
         left join sys_user su on t.update_by_ = su.id_
         <where>