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

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

@@ -458,4 +458,6 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     List<MusicMemberDto> queryMusicMemberList(Map<String, Object> params);
+    
+	int updateIsShowRecordOfStudent(@Param("musicGroupId") String musicGroupId, @Param("isShowRecordOfStudent") Boolean isShowRecordOfStudent);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicCardDto.java

@@ -42,6 +42,9 @@ public class MusicCardDto {
 
     @ApiModelProperty(value = "vip课数量",required = true)
     private Integer vipClassNum;
+	
+    @ApiModelProperty(value = "学生端是否展示乐团档案",required = true)
+	private Boolean isShowRecordOfStudent = false;
 
     public String getPaymentStatus() {
         return paymentStatus;
@@ -141,4 +144,12 @@ public class MusicCardDto {
     public void setSubjectId(String subjectId) {
         this.subjectId = subjectId;
     }
+
+	public Boolean getIsShowRecordOfStudent() {
+		return isShowRecordOfStudent;
+	}
+
+	public void setIsShowRecordOfStudent(Boolean isShowRecordOfStudent) {
+		this.isShowRecordOfStudent = isShowRecordOfStudent;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroup.java

@@ -179,6 +179,8 @@ public class MusicGroup {
 	private String subjectName;
 
 	private Boolean hasVerifyMusicalList = false;
+	
+	private Boolean isShowRecordOfStudent = false;
 
 	//0云教练1云教练+
 	private Integer cloudTeacherType;
@@ -624,4 +626,12 @@ public class MusicGroup {
 	public void setIsRemedy(Boolean remedy) {
 		isRemedy = remedy;
 	}
+
+	public Boolean getIsShowRecordOfStudent() {
+		return isShowRecordOfStudent;
+	}
+
+	public void setIsShowRecordOfStudent(Boolean isShowRecordOfStudent) {
+		this.isShowRecordOfStudent = isShowRecordOfStudent;
+	}
 }

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

@@ -43,6 +43,7 @@
         <result column="cloud_teacher_type_" property="cloudTeacherType"/>
         <result column="course_view_type_" property="courseViewType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
     </resultMap>
     
     <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
@@ -217,6 +218,7 @@
         </set>
         WHERE id_ = #{id}
     </update>
+    
     <update id="batchUpdateEdu">
         UPDATE music_group
         SET educational_teacher_id_ = #{educationUserId}
@@ -301,6 +303,7 @@
         <result column="music_group_num_" property="musicGroupNum"/>
         <result column="music_group_status_" property="musicGroupStatus"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="is_show_record_of_student_" property="isShowRecordOfStudent"/>
     </resultMap>
 
     <select id="queryUserMusicGroups" resultMap="queryUserMusicGroupsMap">
@@ -313,6 +316,7 @@
              , s.id_        subject_id_
              , mg.id_       music_group_id_
              , mg.status_   music_group_status_
+             , mg.is_show_record_of_student_
         FROM student_registration sr
                      LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
                      LEFT JOIN `subject` s ON sr.actual_subject_id_ = s.id_
@@ -933,4 +937,8 @@
             </if>
         </where>
     </sql>
+    
+    <update id="updateIsShowRecordOfStudent" parameterType="map">
+    	update music_group set is_show_record_of_student_ = #{isShowRecordOfStudent},update_time_ = now() where id_ = #{musicGroupId}
+    </update>
 </mapper>

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

@@ -7,10 +7,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -43,6 +45,9 @@ public class MusicGroupRecordController extends BaseController {
 	
 	@Autowired
 	private ClassGroupDao classGroupDao;
+	
+	@Autowired
+	private MusicGroupDao musicGroupDao;
 
 	@ApiOperation(value = "查询基本信息")
 	@GetMapping("/queryBasicInfo")
@@ -86,4 +91,11 @@ public class MusicGroupRecordController extends BaseController {
 	public Object queryStudentInfo(MusicGroupRecordStudentQueryInfo queryInfo) {
 		return succeed(studentRegistrationService.queryStudentRegisterInstrumentsDetailList(queryInfo));
 	}
+
+	@ApiOperation(value = "设置档案是否显示")
+	@PostMapping("/settingStudentIsShow")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupRecord/settingStudentIsShow')")
+	public Object settingStudentIsShow(String musicGroupId,Boolean isShowRecordOfStudent) {
+		return succeed(musicGroupDao.updateIsShowRecordOfStudent(musicGroupId, isShowRecordOfStudent));
+	}
 }

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

@@ -3,7 +3,6 @@ package com.ym.mec.web.controller;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
-import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -99,6 +98,7 @@ public class MusicGroupTrainPlanController extends BaseController {
 		}else {
 			map.put("graduateNum", gradeMap.get(6));
 		}
+		map.put("isShowRecordOfStudent", musicGroup.getIsShowRecordOfStudent());
 		
 		return succeed(map);
 	}