Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -481,6 +481,16 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<TeacherClassCourseSchudeleDto> queryTeacherClassCourseSchedule(Map<String, Object> params);
 
     /**
+     * @describe 获取教师指定乐团下的课程
+     * @author Joburgess
+     * @date 2020/3/8
+     * @param params
+     * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassCourseSchudeleDto>
+     */
+    List<TeacherClassCourseSchudeleDto> findTeacherGroupCourses(Map<String, Object> params);
+    int countTeacherGroupCourses(Map<String, Object> params);
+
+    /**
      * @param params:
      * @return java.util.List<com.ym.mec.biz.dal.dto.TeacherClassCourseSchudeleDto>
      * @describe 查询老师指定班级历史排课信息

mec-biz/src/main/java/com/ym/mec/biz/dal/page/GroupCourseScheduleQueryInfo.java

@@ -0,0 +1,39 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/3/8
+ */
+public class GroupCourseScheduleQueryInfo extends QueryInfo {
+
+    private Integer teacherId;
+    private String groupId;
+    private GroupType groupType;
+
+    public Integer getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Integer teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public GroupType getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(GroupType groupType) {
+        this.groupType = groupType;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.page.GroupCourseScheduleQueryInfo;
+import com.ym.mec.common.page.PageInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/3/8
+ */
+public interface GroupCourseScheduleService {
+
+    /**
+     * @describe 获取课程组下指定教师的课表
+     * @author Joburgess
+     * @date 2020/3/8
+     * @param groupCourseScheduleQueryInfo: 教师编号
+     * @return com.ym.mec.common.page.PageInfo
+     */
+    PageInfo findGroupCourses(GroupCourseScheduleQueryInfo groupCourseScheduleQueryInfo);
+
+}

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

@@ -0,0 +1,45 @@
+package com.ym.mec.biz.service.impl;
+
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.page.GroupCourseScheduleQueryInfo;
+import com.ym.mec.biz.service.GroupCourseScheduleService;
+import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.util.collection.MapUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/3/8
+ */
+@Service
+public class GroupCourseScheduleServiceImpl implements GroupCourseScheduleService {
+
+    @Autowired
+    private CourseScheduleDao courseScheduleDao;
+
+    @Override
+    public PageInfo findGroupCourses(GroupCourseScheduleQueryInfo queryInfo) {
+        PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List dataList = null;
+        int count = courseScheduleDao.countTeacherGroupCourses(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = courseScheduleDao.findTeacherGroupCourses(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+}

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

@@ -214,16 +214,16 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Override
     public Map<String, Object> checkCanApplyFreePracticeGroup(Integer userId) {
         Map<String,Object> result=new HashMap<>();
-        int recordNum = practiceLessonApplyDao.checkUserIsApply(userId);
-        LocalDateTime now=LocalDateTime.now();
-        if(recordNum>0){
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
-            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
-        }else{
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
-            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
-        }
-
+//        int recordNum = practiceLessonApplyDao.checkUserIsApply(userId);
+//        LocalDateTime now=LocalDateTime.now();
+//        if(recordNum>0){
+//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
+//            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
+//        }else{
+//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
+//            result.put("canApply", now.compareTo(applyExpireDateTime)<=0?1:0);
+//        }
+        result.put("canApply", 1);
         return result;
     }
 
@@ -1655,24 +1655,24 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             return result;
         }
 
-        int recordNum = practiceLessonApplyDao.checkUserIsApply(practiceGroup.getStudentId());
-        if(recordNum>0){
-            LocalDateTime nowDateTime=LocalDateTime.now();
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
-            if(nowDateTime.compareTo(applyExpireDateTime)>0){
-                result.put("status", "APPLY_DATE_OVERFLOW");
-                result.put("info", "预约失败，超出可预约时间范围。");
-                return result;
-            }
-        }else{
-            LocalDateTime nowDateTime=LocalDateTime.now();
-            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
-            if(nowDateTime.compareTo(applyExpireDateTime)>0){
-                result.put("status", "APPLY_DATE_OVERFLOW");
-                result.put("info", "预约失败，超出可预约时间范围。");
-                return result;
-            }
-        }
+//        int recordNum = practiceLessonApplyDao.checkUserIsApply(practiceGroup.getStudentId());
+//        if(recordNum>0){
+//            LocalDateTime nowDateTime=LocalDateTime.now();
+//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-29 00:00:00", DateUtil.dateTimeFormatter);
+//            if(nowDateTime.compareTo(applyExpireDateTime)>0){
+//                result.put("status", "APPLY_DATE_OVERFLOW");
+//                result.put("info", "预约失败，超出可预约时间范围。");
+//                return result;
+//            }
+//        }else{
+//            LocalDateTime nowDateTime=LocalDateTime.now();
+//            LocalDateTime applyExpireDateTime=LocalDateTime.parse("2020-02-22 20:00:00", DateUtil.dateTimeFormatter);
+//            if(nowDateTime.compareTo(applyExpireDateTime)>0){
+//                result.put("status", "APPLY_DATE_OVERFLOW");
+//                result.put("info", "预约失败，超出可预约时间范围。");
+//                return result;
+//            }
+//        }
 
         List<Date> allCourseDates = new ArrayList<>();
         allCourseDates.add(practiceGroup.getFirstCourseTime());

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

@@ -1223,6 +1223,41 @@
         <include refid="global.limit"/>
     </select>
 
+    <sql id="teacherGroupCourseQueryCondition">
+        <where>
+            cs.actual_teacher_id_=#{teacherId}
+            AND cs.music_group_id_ = #{groupId}
+            AND cs.group_type_ = #{groupType}
+        </where>
+    </sql>
+
+    <select id="findTeacherGroupCourses" resultMap="teacherClassCourseSchedule">
+        SELECT
+            cs.class_group_id_,
+            cs.id_ course_schedule_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_,
+            cs.name_ course_schedule_name_,
+            cs.student_num_,
+            cs.leave_student_num_,
+            cs.type_,
+            cs.status_,
+            cs.actual_teacher_id_,
+            cs.teach_mode_
+        FROM course_schedule cs
+        <include refid="teacherGroupCourseQueryCondition"/>
+        ORDER BY CONCAT( cs.class_date_, ' ', cs.start_class_time_ )
+        <include refid="global.limit"/>
+    </select>
+
+    <select id="countTeacherGroupCourses" resultMap="teacherClassCourseSchedule">
+        SELECT
+            COUNT(cs.id_)
+        FROM course_schedule cs
+        <include refid="teacherGroupCourseQueryCondition"/>
+    </select>
+
     <select id="queryTeacherHistoryClassCourseSchedule" resultMap="teacherClassCourseSchedule">
         SELECT
         cs.class_group_id_,