Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -114,6 +114,11 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         musicSheetQuery.setMusicTagId(query.getMusicTagId());
         musicSheetQuery.setSubjectId(query.getSubjectId());
         musicSheetQuery.setKeyword(query.getKeyword());
+        //把集合转为字符串
+        String collect1 = musicSheetIds.stream()
+                .map(String::valueOf)
+                .collect(Collectors.joining(", "));
+        musicSheetQuery.setCollect(collect1);
 
         List<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> musicSheets = tenantAlbumMusicMapper.selectPage(page, musicSheetQuery);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumMusicWrapper.java

@@ -163,8 +163,8 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("机构id")
         private Long tenantId;
 
-
-
+        @ApiModelProperty(name = "集合")
+        private String collect;
 
 
         public String getKeyword() {
@@ -220,6 +220,9 @@ public class TenantAlbumMusicWrapper {
             @ApiModelProperty("1:收藏 0:未收藏")
             private boolean favorite;
 
+            @ApiModelProperty("声谱类型，SINGLE:单曲，CONCERT:合奏")
+            private String musicSheetType;
+
             public String jsonString() {
                 return JSON.toJSONString(this);
             }
@@ -256,6 +259,9 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty("关键词")
         private String keyword;
 
+        @ApiModelProperty(name = "集合")
+        private String collect;
+
 
 
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -369,7 +369,7 @@
 		group by smcr.user_id_, DATE_FORMAT(create_time_, '%Y-%m-%d')) mprs ON mprs.user_id_ = st.user_id_
 		left join sys_user su ON st.user_id_ = su.id_
 		left join subject sb ON sb.id_ = st.subject_id_
-		where st.membership_end_time_ >= NOW() AND mprs.user_id_ = st.user_id_
+		where mprs.user_id_ = st.user_id_
 		<if test="search != null and search != ''">
 			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
 		</if>
@@ -384,32 +384,34 @@
 		from student st
 		left join sys_user su ON st.user_id_ = su.id_
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
-		where st.membership_end_time_ >= NOW()
-		<if test="tenantId != null">
-			AND smcr.tenant_id_ = #{tenantId}
-		</if>
-		<if test="startTime != null and startTime != ''">
-			AND smcr.create_time_ BETWEEN #{startTime} AND #{endTime}
-		</if>
-		<if test="search != null and search != ''">
-			AND su.username_ LIKE CONCAT('%',#{keyword},'%')
-		</if>
+		<where>
+			<if test="tenantId != null">
+				AND smcr.tenant_id_ = #{tenantId}
+			</if>
+			<if test="startTime != null and startTime != ''">
+				AND smcr.create_time_ BETWEEN #{startTime} AND #{endTime}
+			</if>
+			<if test="search != null and search != ''">
+				AND su.username_ LIKE CONCAT('%',#{keyword},'%')
+			</if>
+		</where>
 	</select>
 	<select id="wechatCompareRecordSum"
 			resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$WechatCompareRecordSumDto">
 		select COUNT(st.user_id_) studentNum,COUNT(DISTINCT DATE_FORMAT(smcr.create_time_,'%Y-%m-%d')) trainDays,SUM(smcr.play_time_) trainTimes
 		from student st
 		LEFT JOIN sys_music_compare_record smcr ON smcr.user_id_ = st.user_id_
-		where st.membership_end_time_ >= NOW()
-		<if test="queryInfo.startTime != null and queryInfo.startTime != ''">
-			AND smcr.create_time_ BETWEEN #{queryInfo.startTime} AND #{queryInfo.endTime}
-		</if>
-		<if test="queryInfo.tenantId != null">
-			AND smcr.tenant_id_ = #{queryInfo.tenantId}
-		</if>
-		<if test="queryInfo.tenantId != null">
-			AND st.tenant_id_ = #{queryInfo.tenantId}
-		</if>
+		<where>
+			<if test="queryInfo.startTime != null and queryInfo.startTime != ''">
+				AND smcr.create_time_ BETWEEN #{queryInfo.startTime} AND #{queryInfo.endTime}
+			</if>
+			<if test="queryInfo.tenantId != null">
+				AND smcr.tenant_id_ = #{queryInfo.tenantId}
+			</if>
+			<if test="queryInfo.tenantId != null">
+				AND st.tenant_id_ = #{queryInfo.tenantId}
+			</if>
+		</where>
 	</select>
     <select id="queryStudentTrain"
             resultType="com.yonge.cooleshow.biz.dal.queryInfo.SysMusicCompareRecordQueryInfo$StudentMusicCompareRecord">

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -26,6 +26,7 @@
         m.music_subject_ as musicSubject,
         m.title_img_ as titleImg,
         m.exquisite_flag_ as exquisiteFlag,
+        m.music_sheet_type_ as musicSheetType,
         u.username_ as userName,
         s.name_ as musicSubjectName
 		FROM music_sheet m
@@ -50,6 +51,9 @@
                 and m.music_sheet_name_ LIKE CONCAT('%',#{param.keyword},'%')
             </if>
         </where>
+        <if test="param.musicSheetIds != null and param.musicSheetIds.size != 0">
+            order by field(m.id_,${param.collect})
+        </if>
 	</select>
     <select id="selectMusicSheetIds" resultType="java.lang.Long">
         select