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

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

@@ -21,6 +21,13 @@ import java.util.Set;
 public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
 
     MusicGroup getLocked(String id);
+    
+    /**
+     * 查询乐团基本信息
+     * @param id
+     * @return
+     */
+    MusicGroupBasicDto queryBasicInfo(String id);
 
     /**
      * 获取学员所在乐团详情列表

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

@@ -0,0 +1,20 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+
+public class MusicGroupBasicDto extends MusicGroup {
+
+	List<CooperationOrganLinkman> cooperationOrganLinkmanList = new ArrayList<CooperationOrganLinkman>();
+
+	public List<CooperationOrganLinkman> getCooperationOrganLinkmanList() {
+		return cooperationOrganLinkmanList;
+	}
+
+	public void setCooperationOrganLinkmanList(List<CooperationOrganLinkman> cooperationOrganLinkmanList) {
+		this.cooperationOrganLinkmanList = cooperationOrganLinkmanList;
+	}
+}

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

@@ -376,4 +376,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return
 	 */
 	PageInfo<MusicMemberDto> queryMusicMemberList(MusicMemberQueryInfo musicMemberQueryInfo);
+	
+	/**
+	 * 查询乐团基本信息
+	 * @param id
+	 * @return
+	 */
+	MusicGroupBasicDto queryBasicInfo(String id);
 }

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

@@ -36,6 +36,7 @@ import com.ym.mec.biz.dal.dto.CloseMusicGroupDto;
 import com.ym.mec.biz.dal.dto.CourseScheduleTeachersDto;
 import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.dto.MusicCardDto;
+import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.dal.dto.SporadicPayDto;
 import com.ym.mec.biz.dal.dto.SubFeeSettingDto;
@@ -3415,4 +3416,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+	@Override
+	public MusicGroupBasicDto queryBasicInfo(String id) {
+		return musicGroupDao.queryBasicInfo(id);
+	}
 }

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

@@ -44,6 +44,18 @@
         <result column="course_view_type_" property="courseViewType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
+    
+    <resultMap type="com.ym.mec.biz.dal.dto.MusicGroupBasicDto" id="MusicGroupBasicDto" extends="MusicGroup">
+    	<result column="organ_name_" property="organName"/>
+        <result column="school_name_" property="schoolName"/>
+        <result column="charge_type_name_" property="chargeTypeName"/>
+        <result column="cooperation_organ_name_" property="cooperationOrganName"/>
+        <result column="team_teacher_name_" property="teamTeacherName"/>
+        <result column="edu_teacher_name_" property="educationalTeacherName"/>
+        <result column="teans_teacher_name_" property="transactionTeacherName"/>
+        <result column="dir_teacher_name_" property="directorUserName"/>
+        <result column="repair_teacher_name_" property="repairUserName"/>
+    </resultMap>
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="MusicGroup">
@@ -58,6 +70,17 @@
         WHERE id_ = #{id} for
         update
     </select>
+    
+    <select id="queryBasicInfo" resultMap="MusicGroupBasicDto">
+        SELECT mg.*,o.name_ organ_name_,s.name_ school_name_ ,co.name_ cooperation_organ_name_,ct.name_ charge_type_name_,
+        u1.real_name_ edu_teacher_name_,u2.real_name_ teans_teacher_name_,u3.real_name_ team_teacher_name_,u4.real_name_ dir_teacher_name_,u5.real_name_ repair_teacher_name_
+        FROM music_group mg left join organization o on mg.organ_id_ = o.id_
+        left join school s on mg.school_id_ = s.id_ left join cooperation_organ co on co.id_ = mg.cooperation_organ_id_
+        left join charge_type ct on ct.id_ = mg.charge_type_id_ left join sys_user u1 on u1.id_ = mg.educational_teacher_id_
+        left join sys_user u2 on u2.id_ = mg.transaction_teacher_id_ left join sys_user u3 on u3.id_ = mg.team_teacher_id_
+        left join sys_user u4 on u4.id_ = mg.director_user_id_ left join sys_user u5 on u5.id_ = mg.repair_user_id_
+        WHERE mg.id_ = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="MusicGroup">

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

@@ -24,6 +24,6 @@ public class CooperationOrganLinkmanController extends BaseController {
 	@GetMapping("/query")
 	@PreAuthorize("@pcs.hasPermissions('cooperationOrganLinkman/query')")
 	public Object query(Integer cooperationOrganId) {
-		return succeed(cooperationOrganLinkmanService);
+		return succeed(cooperationOrganLinkmanService.queryByCooperationOrganId(cooperationOrganId));
 	}
 }

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

@@ -0,0 +1,42 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.dto.MusicGroupBasicDto;
+import com.ym.mec.biz.service.CooperationOrganLinkmanService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("musicGroupRecord")
+@Api(tags = "乐团档案")
+@RestController
+public class MusicGroupRecordController extends BaseController {
+
+	@Autowired
+	private CooperationOrganLinkmanService cooperationOrganLinkmanService;
+	
+	@Autowired
+	private MusicGroupService musicGroupService;
+
+	@ApiOperation(value = "查询基本信息")
+	@GetMapping("/queryBasicInfo")
+	@PreAuthorize("@pcs.hasPermissions('musicGroupRecord/queryBasicInfo')")
+	public Object queryBasicInfo(String musicGroupId) {
+		
+		MusicGroupBasicDto musicGroupBasicDto = musicGroupService.queryBasicInfo(musicGroupId);
+		
+		if(musicGroupBasicDto != null){
+			Integer cooperationOrganId = musicGroupBasicDto.getCooperationOrganId();
+			musicGroupBasicDto.setCooperationOrganLinkmanList(cooperationOrganLinkmanService.queryByCooperationOrganId(cooperationOrganId));
+		}
+		
+		return succeed(musicGroupBasicDto);
+	}
+}