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

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,6 +11,9 @@ import com.ym.mec.biz.dal.entity.MusicGroup;
 public class MusicGroupBasicDto extends MusicGroup {
 
 	List<CooperationOrganLinkman> cooperationOrganLinkmanList = new ArrayList<CooperationOrganLinkman>();
+	
+	@ApiModelProperty(value = "衔接老师手机号码",required = false)
+	private String transactionTeacherPhone;
 
 	public List<CooperationOrganLinkman> getCooperationOrganLinkmanList() {
 		return cooperationOrganLinkmanList;
@@ -17,4 +22,12 @@ public class MusicGroupBasicDto extends MusicGroup {
 	public void setCooperationOrganLinkmanList(List<CooperationOrganLinkman> cooperationOrganLinkmanList) {
 		this.cooperationOrganLinkmanList = cooperationOrganLinkmanList;
 	}
+
+	public String getTransactionTeacherPhone() {
+		return transactionTeacherPhone;
+	}
+
+	public void setTransactionTeacherPhone(String transactionTeacherPhone) {
+		this.transactionTeacherPhone = transactionTeacherPhone;
+	}
 }

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

@@ -25,6 +25,10 @@
     <resultMap type="com.ym.mec.biz.dal.entity.CooperationOrgan" id="ExtCooperationOrgan" extends="CooperationOrgan">
         <result column="organ_id_" property="organization.id"/>
         <result column="organ_name_" property="organization.name"/>
+        <collection property="cooperationOrganLinkmanList"
+                     select="com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao.queryByCooperationOrganId"
+                     column="id_">
+        </collection>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->

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

@@ -53,6 +53,7 @@
         <result column="team_teacher_name_" property="teamTeacherName"/>
         <result column="edu_teacher_name_" property="educationalTeacherName"/>
         <result column="teans_teacher_name_" property="transactionTeacherName"/>
+        <result column="teans_teacher_phone_" property="transactionTeacherPhone"/>
         <result column="dir_teacher_name_" property="directorUserName"/>
         <result column="repair_teacher_name_" property="repairUserName"/>
     </resultMap>
@@ -73,7 +74,8 @@
     
     <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_
+        u1.real_name_ edu_teacher_name_,u2.real_name_ teans_teacher_name_,u2.phone_ teans_teacher_phone_,
+        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_

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

@@ -37,7 +37,7 @@ public class CooperationOrganController extends BaseController {
     @ApiOperation(value = "新增合作单位(教学点)")
     @PostMapping("/add")
     @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/add')")
-    public Object add(CooperationOrgan cooperationOrgan) {
+    public Object add(@RequestBody CooperationOrgan cooperationOrgan) {
         cooperationOrganService.insert(cooperationOrgan);
         return succeed();
     }
@@ -53,7 +53,7 @@ public class CooperationOrganController extends BaseController {
     @ApiOperation(value = "修改合作单位(教学点)")
     @PutMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('cooperationOrgan/update')")
-    public Object update(CooperationOrgan cooperationOrgan) {
+    public Object update(@RequestBody CooperationOrgan cooperationOrgan) {
         cooperationOrgan.setUpdateTime(new Date());
         cooperationOrganService.updateCooperation(cooperationOrgan);
         return succeed();