Merge remote-tracking branch 'origin/music_detail' into music_detail

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -421,7 +421,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param userId
      * @return
      */
-    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId);
+    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(@Param("userId") Integer userId, @Param("musicGroupId") String musicGroupId);
 
     /**
      * 获取学员剩余课程费用

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

@@ -352,7 +352,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
      * @param userId
      * @return
      */
-    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId);
+    List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId,String musicGroupId);
 
 
     /**

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

@@ -2753,7 +2753,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             throw new BizException("请登录");
         }
         List<ClassGroup> classGroups = classGroupDao.queryStudentClassGroups(musicGroupId, sysUser.getId());
-        if(classGroups.size() == 0){
+        if(classGroups.size() > 0){
             classGroups.forEach(e->{
                 e.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(e.getId().toString()));
             });

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

@@ -1799,8 +1799,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId) {
-        return studentRegistrationDao.queryStudentMusicGroupInfo(userId);
+    public List<StudentMusicGroupDto> queryStudentMusicGroupInfo(Integer userId,String musicGroupId) {
+        return studentRegistrationDao.queryStudentMusicGroupInfo(userId,musicGroupId);
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/MusicGroupNewsMapper.xml

@@ -73,12 +73,28 @@
 	<select id="queryPage" resultMap="MusicGroupNews" parameterType="map">
 		SELECT mgn.*,su.real_name_ FROM music_group_news mgn
 		LEFT JOIN sys_user su ON  su.id_ = mgn.operator_id_
+		<where>
+			<if test="search != null and search != ''">
+				mgn.music_group_id_ = #{search}
+			</if>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				mgn.music_group_id_ = #{musicGroupId}
+			</if>
+		</where>
 		ORDER BY mgn.id_
 		<include refid="global.limit"/>
 	</select>
 	
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM music_group_news
+		SELECT COUNT(mgn.id_) FROM music_group_news mgn
+		<where>
+			<if test="search != null and search != ''">
+				mgn.music_group_id_ = #{search}
+			</if>
+			<if test="musicGroupId != null and musicGroupId != ''">
+				mgn.music_group_id_ = #{musicGroupId}
+			</if>
+		</where>
 	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -1115,6 +1115,9 @@
         ON mgq.music_group_id_ = sr.music_group_id_
         AND mgq.user_id_ = sr.user_id_ AND mgq.join_date_ = sr.create_time_
         where sr.user_id_ = #{userId}
+        <if test="musicGroupId != null and musicGroupId != ''">
+            AND sr.music_group_id_ = #{musicGroupId}
+        </if>
         order by sr.id_
     </select>
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -111,12 +111,12 @@ public class MusicGroupController extends BaseController {
 
     @ApiOperation("获取学生所在乐团列表")
     @GetMapping(value = "/queryStudentMusicGroupInfo")
-    public Object queryStudentMusicGroupInfo() {
+    public Object queryStudentMusicGroupInfo(String musicGroupId) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(studentRegistrationService.queryStudentMusicGroupInfo(sysUser.getId()));
+        return succeed(studentRegistrationService.queryStudentMusicGroupInfo(sysUser.getId(),musicGroupId));
     }
 
     @ApiOperation("获取学生个人中心乐团信息")

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupDetailController.java

@@ -82,7 +82,7 @@ public class MusicGroupDetailController extends BaseController {
     }
 
     @ApiOperation(value = "查询学员班级列表")
-    @GetMapping("/queryStudentAndTeacher")
+    @GetMapping("queryStudentAndTeacher")
     public Object queryStudentClassGroupsAndTeacher(String musicGroupId) {
         return succeed(classGroupService.queryStudentClassGroupsAndTeacher(musicGroupId));
     }

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

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.MusicGroupNews;
+import com.ym.mec.biz.dal.page.MusicGroupTeachersQueryInfo;
 import com.ym.mec.biz.service.MusicGroupNewsService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.exception.BizException;
@@ -59,7 +60,7 @@ public class MusicGroupNewsController extends BaseController {
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupNews/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(MusicGroupTeachersQueryInfo queryInfo) {
         return succeed(musicGroupNewsService.queryPage(queryInfo));
     }
 

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

@@ -45,7 +45,7 @@ public class MusicGroupPerformanceController extends BaseController {
 					throw new BizException("请勿录入特殊字符");
 				}
 			}
-			musicGroupPerformance.setMusicGroupName(StringUtils.join(musicScoreNames,","));
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.insert(musicGroupPerformance));
 	}
@@ -54,6 +54,15 @@ public class MusicGroupPerformanceController extends BaseController {
 	@PostMapping(value = "update")
 	@PreAuthorize("@pcs.hasPermissions('musicGroupPerformance/update')")
 	public Object update(MusicGroupPerformance musicGroupPerformance) {
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
+			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
+		}
 		return succeed(musicGroupPerformanceService.update(musicGroupPerformance));
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicGroupPerformanceController.java

@@ -13,9 +13,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @RequestMapping("eduMusicGroupPerformance")
 @Api(tags = "乐团展演信息")
 @RestController
@@ -28,23 +31,36 @@ public class EduMusicGroupPerformanceController extends BaseController {
 
 	@ApiOperation("新增")
 	@PostMapping(value = "add")
-	public Object add(MusicGroupPerformance musicGroupPerformance) {
+	public Object add(@RequestBody MusicGroupPerformance musicGroupPerformance) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if(sysUser == null){
 			throw new BizException("请登录");
 		}
 		musicGroupPerformance.setOperator(sysUser.getId());
-		if(StringUtils.isNotEmpty(musicGroupPerformance.getMusicScoreName())){
-			if(musicGroupPerformance.getMusicScoreName().contains(",")){
-				throw new BizException("请勿录入特殊字符");
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
 			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
 		}
 		return succeed(musicGroupPerformanceService.insert(musicGroupPerformance));
 	}
 
 	@ApiOperation("修改")
 	@PostMapping(value = "update")
-	public Object update(MusicGroupPerformance musicGroupPerformance) {
+	public Object update(@RequestBody MusicGroupPerformance musicGroupPerformance) {
+		List<String> musicScoreNames = musicGroupPerformance.getMusicScoreNames();
+		if(musicScoreNames != null && musicScoreNames.size() > 0){
+			for (String musicScoreName : musicScoreNames) {
+				if(musicScoreName.contains(",")){
+					throw new BizException("请勿录入特殊字符");
+				}
+			}
+			musicGroupPerformance.setMusicScoreName(StringUtils.join(musicScoreNames,","));
+		}
 		return succeed(musicGroupPerformanceService.update(musicGroupPerformance));
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoAlbumController.java

@@ -46,6 +46,6 @@ public class EduPhotoAlbumController extends BaseController {
 	@ApiOperation("分页查询")
 	@PostMapping(value = "queryPage")
 	public Object queryPage(PhotoQueryInfo queryInfo) {
-		return succeed(photoAlbumService.queryPage(queryInfo));
+		return succeed(photoAlbumService.queryAlbumPage(queryInfo));
 	}
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPhotoController.java

@@ -44,6 +44,6 @@ public class EduPhotoController extends BaseController {
 	@ApiOperation("分页查询")
 	@PostMapping(value = "queryPage")
 	public Object queryPage(PhotoQueryInfo queryInfo) {
-		return succeed(photoService.queryPage(queryInfo));
+		return succeed(photoService.queryPhotoPage(queryInfo));
 	}
 }