1、陪练课调整

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

@@ -1047,6 +1047,19 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
                                                           @Param("endTime") Date endTime);
 
     /**
+     * @describe 获取教师在指定时间段内的课程
+     * @author Joburgess
+     * @date 2020/2/2
+     * @param userId: 教师编号列表
+     * @param startTime: 开始时间
+     * @param endTime: 结束时间
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+     */
+    List<CourseSchedule> findTeacherCoursesWithDateRange(@Param("userId") Integer userId,
+                                                          @Param("startTime") Date startTime,
+                                                          @Param("endTime") Date endTime);
+
+    /**
      * @describe 获取指定学员的陪练课
      * @author Joburgess
      * @date 2020/2/3
@@ -1105,4 +1118,14 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @date 2019/10/21
      */
     List<Map<Long, Integer>> countGroupOverCourse(@Param("groupIds") List<String> groupIds,@Param("groupType")String groupType);
+
+    /**
+     * @describe 获取学生相关的课程
+     * @author Joburgess
+     * @date 2020/2/10
+     * @param userId:
+     * @return java.util.List<com.ym.mec.biz.dal.entity.CourseSchedule>
+     */
+    List<CourseSchedule> findUserCourses(@Param("userId") Integer userId,
+                                         @Param("teacherIds") List<Integer> teacherIds);
 }

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

@@ -75,6 +75,15 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
     List<TeacherBasicDto> findTeachers(@Param("userIds") List<Integer> userIds);
 
     /**
+     * @describe
+     * @author Joburgess
+     * @date 2020/2/10
+     * @param userIds:
+     * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
+     */
+    List<SimpleUserDto> findSimpleTeachers(@Param("userIds") List<Integer> userIds);
+
+    /**
      * @describe 获取指定声部和分部下的全职老师
      * @author Joburgess
      * @date 2020/2/2

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

@@ -10,6 +10,11 @@ public class SimpleUserDto {
 
     private String userName;
 
+    public SimpleUserDto(Integer userId, String userName) {
+        this.userId = userId;
+        this.userName = userName;
+    }
+
     public Integer getUserId() {
         return userId;
     }

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

@@ -57,7 +57,18 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
      * @param subjectId: 声部编号
      * @return java.util.List<com.ym.mec.biz.dal.dto.SimpleUserDto>
      */
-	List<TeacherBasicDto> getEnableApplyTeachers(Integer userId, Integer subjectId);
+	List<SimpleUserDto> getEnableApplyTeachers(Integer userId, Integer subjectId);
+
+	/**
+	 * @describe 获取指定教师的空闲时间
+	 * @author Joburgess
+	 * @date 2020/2/10
+	 * @param userId: 用户编号
+	 * @param teacherId: 教师编号
+	 * @param firstClassTime: 第一节课开始时间
+	 * @return java.util.Map
+	 */
+	Map getTeacherFreeTimes(Integer userId, Integer teacherId, Date firstClassTime);
 
     /**
      * @describe 获取指定学员所在分部下的教师空闲时间
@@ -68,13 +79,14 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
      * @param firstClassTime: 第一节课开始时间
      * @return java.util.Map
      */
-    Map getTeacherFreeTimes(Integer userId, Integer subjectId, Date firstClassTime);
+    Map getTeachersFreeTimes(Integer userId, Integer subjectId, Date firstClassTime);
 
     /**
      * @describe 获取指定日期内课一预约课程的时间
      * @author Joburgess
      * @date 2020/2/2
-     * @param days: 天数
+     * @param startDay: 天数
+     * @param endDay: 天数
      * @return java.util.Map
      */
 	List<Date> getEnableApplyDates(Date startDay,Date endDay);
@@ -89,6 +101,15 @@ public interface PracticeGroupService extends BaseService<Long, PracticeGroup> {
     Map practiceApply(PracticeGroup practiceGroup);
 
 	/**
+	 * @describe 陪练课预约2
+	 * @author Joburgess
+	 * @date 2020/1/31
+	 * @param practiceGroup: 预约信息
+	 * @return java.util.Map
+	 */
+	Map practiceApply2(PracticeGroup practiceGroup);
+
+	/**
 	 * 获取陪练课列表
 	 * @param queryInfo
 	 * @return

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

@@ -2106,15 +2106,15 @@
     </select>
     <select id="findTeachersCoursesWithDateRange" resultMap="CourseSchedule">
         SELECT
-            cs.id_,
-            cs.class_date_,
-            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-            csts.user_id_ actual_teacher_id_,
-            cs.group_type_
+        cs.id_,
+        cs.class_date_,
+        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+        csts.user_id_ actual_teacher_id_,
+        cs.group_type_
         FROM
-            course_schedule_teacher_salary csts
-            LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+        course_schedule_teacher_salary csts
+        LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
         AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
@@ -2123,6 +2123,22 @@
             #{userId}
         </foreach>
     </select>
+    <select id="findTeacherCoursesWithDateRange" resultMap="CourseSchedule">
+        SELECT
+        cs.id_,
+        cs.class_date_,
+        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+        csts.user_id_ actual_teacher_id_,
+        cs.group_type_
+        FROM
+        course_schedule_teacher_salary csts
+        LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.class_date_ BETWEEN DATE_FORMAT(#{startTime},"%Y-%m-%d") AND DATE_FORMAT(#{endTime},"%Y-%m-%d")
+        AND csts.user_id_ = #{userId}
+    </select>
     <select id="findStudentPracticeCourses" resultMap="courseScheduleDto">
         SELECT
             cs.id_ seal_class_id_,
@@ -2237,4 +2253,31 @@
         </foreach>
         GROUP BY cs.music_group_id_
     </select>
+    <select id="findUserCourses" resultMap="CourseSchedule">
+        SELECT
+            cs.id_,
+            cs.class_group_id_,
+            cs.group_type_,
+            cs.music_group_id_,
+            cs.status_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.teacher_id_,
+            cs.teach_mode_,
+            cs.type_
+        FROM
+          course_schedule_student_payment cssp
+          LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
+          LEFT JOIN class_group_student_mapper cgsm ON cgsm.user_id_ = cssp.user_id_
+          AND cssp.class_group_id_ = cgsm.class_group_id_
+        WHERE
+          ( cs.del_flag_ != 1 OR cs.del_flag_ IS NULL )
+          AND cssp.user_id_ = #{userId}
+          AND cgsm.status_ = 'NORMAL'
+          AND cs.type_ IN ('SINGLE','HIGH','VIP')
+          AND cs.teacher_id_ IN
+          <foreach collection="teacherIds" item="teacherId" open="(" close=")" separator=",">
+              #{teacherId}
+          </foreach>
+    </select>
 </mapper>

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

@@ -298,6 +298,18 @@
             </if>
         </where>
     </select>
+    <select id="findSimpleTeachers" resultType="com.ym.mec.biz.dal.dto.SimpleUserDto">
+        SELECT su.id_ userId,su.real_name_ userName FROM sys_user su
+        LEFT JOIN teacher t ON su.id_=t.id_
+        <where>
+            <if test="userIds != null">
+                su.id_ IN
+                <foreach collection="userIds" separator="," open="(" close=")" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
     <select id="findTeaTeachersByOrganAndSubject" resultMap="TeacherBasicDto">
         SELECT
             su.id_,

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

@@ -67,12 +67,22 @@ public class PracticeGroupController extends BaseController {
 
     @ApiOperation("获取指定学员所在分部下的教师空闲时间")
     @GetMapping(value = "/getTeacherFreeTimes")
-    public Object getTeacherFreeTimes(Integer subjectId, Date firstClassTime){
+    public Object getTeacherFreeTimes(Integer teacherId, Date firstClassTime){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return succeed(practiceGroupService.getTeacherFreeTimes(sysUser.getId(),subjectId,firstClassTime));
+        return succeed(practiceGroupService.getTeacherFreeTimes(sysUser.getId(),teacherId,firstClassTime));
+    }
+
+    @ApiOperation("获取指定学员所在分部下的教师空闲时间")
+    @GetMapping(value = "/getTeachersFreeTimes")
+    public Object getTeachersFreeTimes(Integer subjectId, Date firstClassTime){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(practiceGroupService.getTeachersFreeTimes(sysUser.getId(),subjectId,firstClassTime));
     }
 
     @ApiOperation("陪练课预约")