增加乐团老师课酬查询和确认接口

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
@@ -54,6 +55,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 跟班级ids查询班级信息
+     *
      * @param ids
      * @return
      */
@@ -61,6 +63,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 根据教师编号获取教师所在乐团，带了哪些班级
+     *
      * @param userId
      * @return
      */
@@ -68,6 +71,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * 获取老师VIP课程信息列表
+     *
      * @param params
      * @return
      */
@@ -75,8 +79,16 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
 
     /**
      * count老师VIP课程信息列表
+     *
      * @param params
      * @return
      */
     int countTeacherVipClass(Map<String, Object> params);
+
+    /**
+     * 获取乐团所有班级列表
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeachers> findClassGroupByMusicGroupId(@Param("musicGroupId") int musicGroupId);
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.dal.BaseDAO;
 
@@ -12,8 +14,17 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
 
     /**
      * 批量插入班级老师
+     *
      * @param classGroupTeacherMapperList
      * @return
      */
     int classGroupTeachersInsert(@Param("classGroupTeacherMapperList") List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
+
+    /**
+     * 查询班级老师
+     *
+     * @param ClassGroupList
+     * @return
+     */
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List<ClassGroup> ClassGroupList);
 }

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

@@ -0,0 +1,24 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+
+import java.util.List;
+
+/**
+ * 班级老师
+ */
+public class ClassGroupTeachers extends ClassGroup {
+
+	/** 班级老师 **/
+	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
+
+
+	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
+		return classGroupTeacherMapperList;
+	}
+
+	public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
+		this.classGroupTeacherMapperList = classGroupTeacherMapperList;
+	}
+}

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

@@ -31,7 +31,10 @@ public class ClassGroupTeacherMapper {
 	/**  */
 	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
-	
+
+	@ApiModelProperty(value = "用户名",required = false)
+	private Integer userName;
+
 	/** 薪酬 */
 	@ApiModelProperty(value = "薪酬",required = false)
 	private BigDecimal salary;
@@ -105,6 +108,14 @@ public class ClassGroupTeacherMapper {
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
+
+	public Integer getUserName() {
+		return userName;
+	}
+
+	public void setUserName(Integer userName) {
+		this.userName = userName;
+	}
 			
 	@Override
 	public String toString() {

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 import java.util.List;
 
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
 import com.ym.mec.biz.dal.dto.HighClassGroup;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
@@ -9,6 +10,7 @@ import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
 
@@ -92,4 +94,13 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     PageInfo<TeacherVipClassInfoDto> getTeacherVipClass(VipClassQueryInfo queryInfo);
+
+
+    /**
+     * 获取乐团班级老师课酬
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
+
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.common.service.BaseService;
 
@@ -15,4 +17,21 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @return
      */
     int classGroupTeachersInsert(List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
+
+
+    /**
+     * 查询班级老师
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> classGroupList);
+
+    /**
+     * 批量更新教师薪酬
+     * @param classGroupTeacherMapperList
+     * @return
+     */
+    boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception;
+
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service.impl;
 
 import com.ym.mec.biz.dal.dao.ClassGroupDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
 import com.ym.mec.biz.dal.dto.HighClassGroup;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
@@ -236,4 +237,23 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         pageInfo.setRows(dataList);
         return pageInfo;
     }
+
+    @Override
+    public List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId) {
+        List<ClassGroupTeachers> classGroupAndTeachersList = classGroupDao.findClassGroupByMusicGroupId(musicGroupId);
+        List<ClassGroup> classGroupList = Collections.unmodifiableList(classGroupAndTeachersList);
+
+        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupList);
+
+        for (ClassGroupTeachers classGroupAndTeachers : classGroupAndTeachersList) {
+            List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
+            for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+                if (classGroupTeacherMapper.getClassGroupId().equals(classGroupAndTeachers.getId())) {
+                    oneClassGroupTeacherMapperList.add(classGroupTeacherMapper);
+                }
+            }
+            classGroupAndTeachers.setClassGroupTeacherMapperList(oneClassGroupTeacherMapperList);
+        }
+        return classGroupAndTeachersList;
+    }
 }

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

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
+import com.ym.mec.biz.dal.dto.ClassGroupTeachers;
+import com.ym.mec.biz.dal.entity.ClassGroup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,4 +28,18 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
     public int classGroupTeachersInsert(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
         return classGroupTeacherMapperDao.classGroupTeachersInsert(classGroupTeacherMapperList);
     }
+
+
+    @Override
+    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> ClassGroupList) {
+        return classGroupTeacherMapperDao.findClassGroupTeachers(ClassGroupList);
+    }
+
+    public boolean classGroupTeacherMapperUpdate(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
+        for (ClassGroupTeacherMapper classGroupTeacherMapper : classGroupTeacherMapperList) {
+            classGroupTeacherMapperDao.update(classGroupTeacherMapper);
+        }
+        return true;
+    }
+
 }

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

@@ -211,7 +211,8 @@
         <result column="current_class_times_" property="currentClassTimes"/>
         <result column="total_class_times_" property="totalClassTimes"/>
         <result column="vip_group_name_" property="vipClassName"/>
-        <result column="audit_status_" property="auditStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="audit_status_" property="auditStatus"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="getTeacherVipClass" resultMap="getTeacherVipClassMap">
@@ -230,4 +231,23 @@
         SELECT COUNT(vg.id_) FROM vip_group vg
         WHERE vg.user_id_ = #{teacherId}
     </select>
+
+
+    <resultMap type="com.ym.mec.biz.dal.dto.ClassGroupTeachers" id="ClassGroupTeachers">
+        <result column="id_" property="id"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="subject_id_list_" property="subjectIdList"/>
+        <result column="name_" property="name"/>
+        <result column="student_num_" property="studentNum"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="expect_student_num_" property="expectStudentNum"/>
+        <result column="total_class_times_" property="totalClassTimes"/>
+    </resultMap>
+    <!-- 根据乐团id获取乐团下所有班级 -->
+    <select id="findClassGroupByMusicGroupId" resultMap="ClassGroupTeachers">
+        SELECT * FROM class_group WHERE music_group_id_ = #{musicGroupId} AND del_flag_ = 0;
+    </select>
 </mapper>

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

@@ -9,10 +9,12 @@
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="class_group_id_" property="classGroupId"/>
         <result column="teacher_role_" property="teacherRole"/>
+        <result column="username_" property="userName"/>
         <result column="user_id_" property="userId"/>
         <result column="salary_" property="salary"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <collection>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -97,4 +99,15 @@
             (#{item.id},#{item.musicGroupId},#{item.classGroupId},#{item.teacherRole},#{item.userId},#{item.salary},#{item.createTime},#{item.updateTime})
         </foreach>
     </insert>
+
+    <!-- 获取乐团班级的老师 -->
+    <select id="findClassGroupTeachers" resultMap="ClassGroupTeacherMapper">
+        SELECT u.username_, ct.*
+        FROM sys_user u,
+        class_group_teacher_mapper ct
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupList" item="classGroup" index="index" open="(" close=")" separator=",">
+            #{classGroup.id}
+        </foreach>
+    </select>
 </mapper>

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

@@ -106,5 +106,20 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupTeacherMapperService.classGroupTeachersInsert(classGroupTeacherMapperList));
     }
 
+    @ApiOperation(value = "获取乐团班级老师课酬")
+    @GetMapping("/findMusicGroupClassTeacher")
+    public Object findMusicGroupClassTeacher(@ApiParam(value = "乐团编号", required = true) @RequestParam Integer musicGroupId) {
+        return succeed(classGroupService.getClassGroupAndTeachers(musicGroupId));
+    }
+
+    @ApiOperation(value = "乐团班级老师课酬确认")
+    @GetMapping("/setClassGroupTeacherSalary")
+    public Object setClassGroupTeacherSalary(@ApiParam(value = "乐团班级老师json", required = true) @RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {
+        if (classGroupTeacherMapperList.size() <= 0) {
+            return failed("参数不合法");
+        }
+        return succeed(classGroupTeacherMapperService.classGroupTeacherMapperUpdate(classGroupTeacherMapperList));
+    }
+
 
 }