修改乐团课酬设置

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

@@ -26,5 +26,5 @@ public interface ClassGroupTeacherMapperDao extends BaseDAO<Long, ClassGroupTeac
      * @param ClassGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List<ClassGroup> ClassGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(@Param("classGroupList") List ClassGroupList);
 }

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

@@ -14,6 +14,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     /**
      * 根据教师ID获取当前课程信息
+     *
      * @param teacherID
      * @return
      */
@@ -94,4 +95,12 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * 根据id批量获取课程
      */
     List<CourseSchedule> findCourseSchedulesByIds(@Param("ids") Long[] ids);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(@Param("classGroupList") List classGroupList);
 }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 
 import java.util.List;
 
@@ -13,6 +14,9 @@ public class ClassGroupTeachers extends ClassGroup {
 	/** 班级老师 **/
 	private List<ClassGroupTeacherMapper> classGroupTeacherMapperList;
 
+	/** 班级老师课酬 */
+	private List<ClassGroupTeacherSalary> classGroupTeacherSalaryList;
+
 
 	public List<ClassGroupTeacherMapper> getClassGroupTeacherMapperList() {
 		return classGroupTeacherMapperList;
@@ -21,4 +25,12 @@ public class ClassGroupTeachers extends ClassGroup {
 	public void setClassGroupTeacherMapperList(List<ClassGroupTeacherMapper> classGroupTeacherMapperList) {
 		this.classGroupTeacherMapperList = classGroupTeacherMapperList;
 	}
+
+	public List<ClassGroupTeacherSalary> getClassGroupTeacherSalaryList() {
+		return classGroupTeacherSalaryList;
+	}
+
+	public void setClassGroupTeacherSalaryList(List<ClassGroupTeacherSalary> classGroupTeacherSalaryList) {
+		this.classGroupTeacherSalaryList = classGroupTeacherSalaryList;
+	}
 }

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

@@ -1,76 +1,11 @@
 package com.ym.mec.biz.dal.entity;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
-public class ClassGroupTeacherSalary {
-    private Long id;
-
-    private Integer musicGroupId;
-
-    private Integer classGroupId;
-
+public class ClassGroupTeacherSalary extends ClassGroupTeacherMapper {
     /**
-    * 老师角色（主教、助教）
-    */
-    private String teacherRole;
-
-    private Integer userId;
-
-    /**
-    * 课时长
-    */
+     * 课时长
+     */
     private Integer duration;
 
-    /**
-    * 薪酬
-    */
-    private BigDecimal salary;
-
-    private Date createTime;
-
-    private Date updateTime;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(Integer musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public Integer getClassGroupId() {
-        return classGroupId;
-    }
-
-    public void setClassGroupId(Integer classGroupId) {
-        this.classGroupId = classGroupId;
-    }
-
-    public String getTeacherRole() {
-        return teacherRole;
-    }
-
-    public void setTeacherRole(String teacherRole) {
-        this.teacherRole = teacherRole;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
     public Integer getDuration() {
         return duration;
     }
@@ -78,28 +13,4 @@ public class ClassGroupTeacherSalary {
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
-
-    public BigDecimal getSalary() {
-        return salary;
-    }
-
-    public void setSalary(BigDecimal salary) {
-        this.salary = salary;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
 }

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.dto.HighClassGroup;
 import com.ym.mec.biz.dal.dto.TeacherMusicClassInfoDto;
 import com.ym.mec.biz.dal.dto.TeacherVipClassInfoDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
+import com.ym.mec.biz.dal.entity.ClassGroupTeacherSalary;
 import com.ym.mec.biz.dal.page.VipClassQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -103,4 +104,12 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     List<ClassGroupTeachers> getClassGroupAndTeachers(Integer musicGroupId);
 
+    /**
+     * 获取乐团班级老师课酬
+     * @param musicGroupId
+     * @return
+     */
+    List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId);
+
+
 }

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

@@ -25,7 +25,7 @@ public interface ClassGroupTeacherMapperService extends BaseService<Long, ClassG
      * @param classGroupList
      * @return
      */
-    List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> classGroupList);
+    List<ClassGroupTeacherMapper> findClassGroupTeachers(List classGroupList);
 
     /**
      * 批量更新教师薪酬

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.CourseScheduleDto;
 import com.ym.mec.biz.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.common.service.BaseService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
@@ -59,4 +60,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
      * 课程交换
      */
     void courseSwap(Long courseScheduleId1,Long courseScheduleId2);
+
+    /**
+     * 获取班级的课程计划
+     *
+     * @param classGroupList
+     * @return
+     */
+    List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList);
 }

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

@@ -15,6 +15,7 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 
+import io.swagger.annotations.ApiImplicitParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -249,9 +250,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     @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);
+        List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupTeacherMapperService.findClassGroupTeachers(classGroupAndTeachersList);
 
         for (ClassGroupTeachers classGroupAndTeachers : classGroupAndTeachersList) {
             List<ClassGroupTeacherMapper> oneClassGroupTeacherMapperList = new ArrayList<>();
@@ -264,4 +264,21 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return classGroupAndTeachersList;
     }
+
+    @Override
+    public List<ClassGroupTeachers> getClassGroupAndTeacherSalary(Integer musicGroupId) {
+        List<ClassGroupTeachers> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId);
+        List<CourseSchedule> classGroupCourseSchedules = courseScheduleService.findClassGroupCourseSchedules(classGroupAndTeachers);
+
+        for (ClassGroupTeachers classGroupAndTeacher : classGroupAndTeachers) {
+            for (CourseSchedule classGroupCourseSchedule : classGroupCourseSchedules) {
+                if(classGroupCourseSchedule.getClassGroupId().equals(classGroupAndTeacher.getId())){
+
+                }
+            }
+
+            List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
+        }
+        return classGroupAndTeachers;
+    }
 }

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

@@ -31,7 +31,7 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
 
     @Override
-    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List<ClassGroup> ClassGroupList) {
+    public List<ClassGroupTeacherMapper> findClassGroupTeachers(List ClassGroupList) {
         return classGroupTeacherMapperDao.findClassGroupTeachers(ClassGroupList);
     }
 

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

@@ -213,7 +213,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseScheduleDao.update(courseSchedules.get(1));
 	}
 
-	/**
+    @Override
+    public List<CourseSchedule> findClassGroupCourseSchedules(List classGroupList) {
+		return courseScheduleDao.findClassGroupCourseSchedules(classGroupList);
+    }
+
+    /**
 	 * @Author: Joburgess
 	 * @Date: 2019/9/24
 	 * 检测学生是否存在重复

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

@@ -312,4 +312,13 @@
             #{id}
         </foreach>
     </select>
+
+    <!-- 获取班级的课程 -->
+    <select id="findClassGroupCourseSchedules" resultMap="CourseSchedule">
+        SELECT * FROM course_schedule
+        WHERE class_group_id_ IN
+        <foreach collection="classGroupList" item="classGroup" index="index" open="(" close=")" separator=",">
+            #{classGroup.id}
+        </foreach>
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -22,7 +22,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
 
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
-		http.csrf().disable().authorizeRequests().antMatchers("/v2/api-docs").permitAll().anyRequest().authenticated().and().httpBasic();
+		http.csrf().disable().authorizeRequests().antMatchers("/v2/api-docs", "/register/findSubByMusicGroupId").permitAll().anyRequest().authenticated().and().httpBasic();
 	}
 
 	@Override

mec-student/src/main/java/com/ym/mec/student/controller/RegisterController.java

@@ -1,11 +1,16 @@
 package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.service.StudentRegistrationService;
+import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+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;
@@ -17,6 +22,8 @@ public class RegisterController extends BaseController {
 
     @Autowired
     private StudentRegistrationService studentRegistrationService;
+    @Autowired
+    private SubjectService subjectService;
 
 
     @ApiOperation(value = "新增学生报名信息")
@@ -25,4 +32,11 @@ public class RegisterController extends BaseController {
         studentRegistrationService.insert(studentRegistration);
         return succeed();
     }
+
+    @ApiOperation(value = "通过乐团编号获取声部列表")
+    @GetMapping("/findSubByMusicGroupId")
+    @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "Integer")})
+    public Object findSubByMusicGroupId(Integer musicGroupId) {
+        return succeed(subjectService.findSubByMusicGroupId(musicGroupId));
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.web.controller;
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
@@ -106,12 +107,18 @@ public class ClassGroupController extends BaseController {
         return succeed(classGroupTeacherMapperService.classGroupTeachersInsert(classGroupTeacherMapperList));
     }
 
-    @ApiOperation(value = "获取乐团班级老师课酬")
+    @ApiOperation(value = "获取乐团班级老师")
     @GetMapping("/findMusicGroupClassTeacher")
     public Object findMusicGroupClassTeacher(@ApiParam(value = "乐团编号", required = true) @RequestParam Integer musicGroupId) {
         return succeed(classGroupService.getClassGroupAndTeachers(musicGroupId));
     }
 
+    @ApiOperation(value = "获取乐团班级老师课酬")
+    @GetMapping("/findMusicGroupClassTeacherSalary")
+    public Object findMusicGroupClassTeacherSalary(@ApiParam(value = "乐团编号", required = true) @RequestParam Integer musicGroupId) {
+        return succeed(classGroupService.getClassGroupAndTeacherSalary(musicGroupId));
+    }
+
     @ApiOperation(value = "乐团班级老师课酬确认")
     @GetMapping("/setClassGroupTeacherSalary")
     public Object setClassGroupTeacherSalary(@ApiParam(value = "乐团班级老师json", required = true) @RequestParam List<ClassGroupTeacherMapper> classGroupTeacherMapperList) throws Exception {