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

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

@@ -0,0 +1,39 @@
+package com.ym.mec.biz.dal.dao;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
+
+public interface CooperationOrganLinkmanDao extends BaseDAO<Integer, CooperationOrganLinkman> {
+
+	/**
+	 * 批量新增
+	 * @param cooperationOrganLinkmanList
+	 * @return
+	 */
+	long batchInsert(List<CooperationOrganLinkman> cooperationOrganLinkmanList);
+
+	/**
+	 * 批量修改
+	 * @param cooperationOrganLinkmanList
+	 * @return
+	 */
+	int batchUpdate(@Param("cooperationOrganLinkmans") List<CooperationOrganLinkman> cooperationOrganLinkmanList);
+
+	/**
+	 * 根据合作单位编号查询联系人
+	 * @param cooperationOrganId
+	 * @return
+	 */
+	List<CooperationOrganLinkman> queryByCooperationOrganId(Integer cooperationOrganId);
+
+	/**
+	 * 根据合作单位删除记录
+	 * @param cooperationOrganId
+	 * @return
+	 */
+	int deleteByCooperationOrganId(Integer cooperationOrganId);
+}

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

@@ -1,5 +1,8 @@
 package com.ym.mec.biz.dal.entity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -80,6 +83,8 @@ public class CooperationOrgan {
 
 	@ApiModelProperty(value = "是否全职资源",required = false)
 	private Integer fullJobResource;
+	
+	private List<CooperationOrganLinkman> cooperationOrganLinkmanList = new ArrayList<CooperationOrganLinkman>();
 
 	public String getRealName() {
 		return realName;
@@ -201,6 +206,14 @@ public class CooperationOrgan {
 		this.isEnable = isEnable;
 	}
 
+	public List<CooperationOrganLinkman> getCooperationOrganLinkmanList() {
+		return cooperationOrganLinkmanList;
+	}
+
+	public void setCooperationOrganLinkmanList(List<CooperationOrganLinkman> cooperationOrganLinkmanList) {
+		this.cooperationOrganLinkmanList = cooperationOrganLinkmanList;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -0,0 +1,81 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(cooperation_organ_linkman):
+ */
+public class CooperationOrganLinkman {
+
+	/**  */
+	private Integer id;
+	
+	/**  */
+	private Integer cooperationOrganId;
+	
+	/** 联系人 */
+	private String linkman;
+	
+	/** 电话 */
+	private String mobileNo;
+	
+	/** 岗位 */
+	private String job;
+	
+	/** 创建时间 */
+	private java.util.Date createTime;
+	
+	public void setId(Integer id){
+		this.id = id;
+	}
+	
+	public Integer getId(){
+		return this.id;
+	}
+			
+	public void setCooperationOrganId(Integer cooperationOrganId){
+		this.cooperationOrganId = cooperationOrganId;
+	}
+	
+	public Integer getCooperationOrganId(){
+		return this.cooperationOrganId;
+	}
+			
+	public void setLinkman(String linkman){
+		this.linkman = linkman;
+	}
+	
+	public String getLinkman(){
+		return this.linkman;
+	}
+			
+	public void setMobileNo(String mobileNo){
+		this.mobileNo = mobileNo;
+	}
+	
+	public String getMobileNo(){
+		return this.mobileNo;
+	}
+			
+	public void setJob(String job){
+		this.job = job;
+	}
+	
+	public String getJob(){
+		return this.job;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,16 @@
+package com.ym.mec.biz.service;
+
+import java.util.List;
+
+import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
+import com.ym.mec.common.service.BaseService;
+
+public interface CooperationOrganLinkmanService extends BaseService<Integer, CooperationOrganLinkman> {
+
+	/**
+	 * 根据合作单位编号获取列表
+	 * @param cooperationOrganId
+	 * @return
+	 */
+	List<CooperationOrganLinkman> queryByCooperationOrganId(Integer cooperationOrganId);
+}

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

@@ -0,0 +1,30 @@
+package com.ym.mec.biz.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao;
+import com.ym.mec.biz.dal.entity.CooperationOrganLinkman;
+import com.ym.mec.biz.service.CooperationOrganLinkmanService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class CooperationOrganLinkmanServiceImpl extends BaseServiceImpl<Integer, CooperationOrganLinkman>  implements CooperationOrganLinkmanService {
+	
+	@Autowired
+	private CooperationOrganLinkmanDao cooperationOrganLinkmanDao;
+
+	@Override
+	public BaseDAO<Integer, CooperationOrganLinkman> getDAO() {
+		return cooperationOrganLinkmanDao;
+	}
+
+	@Override
+	public List<CooperationOrganLinkman> queryByCooperationOrganId(Integer cooperationOrganId) {
+		return cooperationOrganLinkmanDao.queryByCooperationOrganId(cooperationOrganId);
+	}
+	
+}

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

@@ -8,11 +8,13 @@ import java.util.Map;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
+import com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.service.ImGroupMemberService;
 import com.ym.mec.biz.service.ImGroupService;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +22,7 @@ import com.ym.mec.biz.dal.dao.CooperationOrganDao;
 import com.ym.mec.biz.service.CooperationOrganService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
@@ -27,6 +30,10 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	
 	@Autowired
 	private CooperationOrganDao cooperationOrganDao;
+	
+	@Autowired
+	private CooperationOrganLinkmanDao cooperationOrganLinkmanDao;
+	
 	@Autowired
 	private MusicGroupDao musicGroupDao;
 	@Autowired
@@ -46,6 +53,18 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public long insert(CooperationOrgan cooperationOrgan) {
+		List<CooperationOrganLinkman> list = cooperationOrgan.getCooperationOrganLinkmanList();
+		
+		if(list != null && list.size() > 0){
+			cooperationOrganLinkmanDao.batchInsert(list);
+		}
+		
+		return super.insert(cooperationOrgan);
+	}
+
+	@Override
 	public List<CooperationOrgan> queryByOrganId(String organId) {
 		return cooperationOrganDao.queryByOrganId(organId);
 	}
@@ -98,6 +117,14 @@ public class CooperationOrganServiceImpl extends BaseServiceImpl<Integer, Cooper
 			//修改乐团主管
 			musicGroupDao.batchUpdateEdu(cooperationOrgan.getId(),cooperationOrgan.getEducationUserId());
 		}
+		
+		//修改了合作单位联系人
+		cooperationOrganLinkmanDao.deleteByCooperationOrganId(cooperationOrgan.getId());
+		List<CooperationOrganLinkman> cooperationOrganLinkmanList = cooperationOrgan.getCooperationOrganLinkmanList();
+		if(cooperationOrganLinkmanList != null && cooperationOrganLinkmanList.size() > 0){
+			cooperationOrganLinkmanDao.batchInsert(cooperationOrganLinkmanList);
+		}
+		
 		cooperationOrganDao.update(cooperationOrgan);
 	}
 

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

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.CooperationOrganLinkmanDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.CooperationOrganLinkman"
+		id="CooperationOrganLinkman">
+		<result column="id_" property="id" />
+		<result column="cooperation_organ_id_" property="cooperationOrganId" />
+		<result column="linkman_" property="linkman" />
+		<result column="mobile_no_" property="mobileNo" />
+		<result column="job_" property="job" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CooperationOrganLinkman">
+		SELECT *
+		FROM cooperation_organ_linkman WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CooperationOrganLinkman">
+		SELECT * FROM
+		cooperation_organ_linkman ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CooperationOrganLinkman"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO cooperation_organ_linkman
+		(id_,cooperation_organ_id_,linkman_,mobile_no_,job_,create_time_)
+		VALUES(#{id},#{cooperationOrganId},#{linkman},#{mobileNo},#{job},#{createTime})
+	</insert>
+	
+	<insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		INSERT INTO cooperation_organ_linkman
+		(id_,cooperation_organ_id_,linkman_,mobile_no_,job_,create_time_)
+		VALUES
+		<foreach collection="list" item="item" separator=",">
+		(#{item.id},#{item.cooperationOrganId},#{item.linkman},#{item.mobileNo},#{item.job},#{item.createTime})
+		</foreach>
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CooperationOrganLinkman">
+		UPDATE cooperation_organ_linkman
+		<set>
+			<if test="cooperationOrganId != null">
+				cooperation_organ_id_ = #{cooperationOrganId},
+			</if>
+			<if test="job != null">
+				job_ = #{job},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="linkman != null">
+				linkman_ = #{linkman},
+			</if>
+			<if test="mobileNo != null">
+				mobile_no_ = #{mobileNo},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+	
+	<update id="batchUpdate" parameterType="com.ym.mec.biz.dal.entity.CooperationOrganLinkman">
+        <foreach collection="cooperationOrganLinkmans" item="cooperationOrganLinkman" separator=";">
+			UPDATE cooperation_organ_linkman
+			<set>
+				<if test="cooperationOrganLinkman.cooperationOrganId != null">
+					cooperation_organ_id_ = #{cooperationOrganLinkman.cooperationOrganId},
+				</if>
+				<if test="cooperationOrganLinkman.job != null">
+					job_ = #{cooperationOrganLinkman.job},
+				</if>
+				<if test="cooperationOrganLinkman.id != null">
+					id_ = #{cooperationOrganLinkman.id},
+				</if>
+				<if test="cooperationOrganLinkman.linkman != null">
+					linkman_ = #{cooperationOrganLinkman.linkman},
+				</if>
+				<if test="cooperationOrganLinkman.mobileNo != null">
+					mobile_no_ = #{cooperationOrganLinkman.mobileNo},
+				</if>
+				<if test="cooperationOrganLinkman.createTime != null">
+					create_time_ = #{cooperationOrganLinkman.createTime},
+				</if>
+			</set>
+			WHERE id_ = #{cooperationOrganLinkman.id}
+        </foreach>
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM cooperation_organ_linkman WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CooperationOrganLinkman" parameterType="map">
+		SELECT * FROM cooperation_organ_linkman ORDER BY id_
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM cooperation_organ_linkman
+	</select>
+	
+	<select id="queryByCooperationOrganId" resultMap="CooperationOrganLinkman">
+		SELECT * FROM cooperation_organ_linkman where cooperation_organ_id_ = #{cooperationOrganId} ORDER BY id_ desc
+	</select>
+	
+	<delete id="deleteByCooperationOrganId">
+		DELETE FROM cooperation_organ_linkman WHERE cooperation_organ_id_ = #{cooperationOrganId}
+	</delete>
+</mapper>

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

@@ -0,0 +1,29 @@
+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.service.CooperationOrganLinkmanService;
+import com.ym.mec.common.controller.BaseController;
+
+@RequestMapping("cooperationOrganLinkman")
+@Api(tags = "合作单位联系人服务")
+@RestController
+public class CooperationOrganLinkmanController extends BaseController {
+
+	@Autowired
+	private CooperationOrganLinkmanService cooperationOrganLinkmanService;
+
+	@ApiOperation(value = "查询合作单位联系人列表")
+	@GetMapping("/query")
+	@PreAuthorize("@pcs.hasPermissions('cooperationOrganLinkman/query')")
+	public Object query(Integer cooperationOrganId) {
+		return succeed(cooperationOrganLinkmanService);
+	}
+}