Merge remote-tracking branch 'origin/master'

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
 
+import java.util.Date;
+
 /**
  * @Author Joburgess
  * @Date 2020/3/8
@@ -18,6 +20,26 @@ public class GroupCourseTimesDto {
 
     private Integer surplusClassTimes;
 
+    private Date startDate;
+
+    private Date endDate;
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+
     public String getGroupId() {
         return groupId;
     }

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

@@ -3991,8 +3991,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			case PRACTICE:
 				PracticeGroup practiceGroup = practiceGroupDao.get(Long.parseLong(groupId));
 				resultMap.put("groupName",practiceGroup.getName());
-				resultMap.put("startTime",practiceGroup.getCoursesStartDate());
-				resultMap.put("endTime",practiceGroup.getCoursesExpireDate());
 				resultMap.put("groupStatus",practiceGroup.getGroupStatus().getCode());
 				teacher = teacherDao.get(practiceGroup.getUserId());
 				resultMap.put("groupTeacher",teacher.getRealName());
@@ -4004,8 +4002,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			case VIP:
 				VipGroup vipGroup = vipGroupDao.get(Long.parseLong(groupId));
 				resultMap.put("groupName",vipGroup.getName());
-				resultMap.put("startTime",vipGroup.getCourseStartDate());
-				resultMap.put("endTime",vipGroup.getCoursesExpireDate());
 				resultMap.put("groupStatus",vipGroup.getStatus().getCode());
 				teacher = teacherDao.get(vipGroup.getUserId());
 				resultMap.put("groupTeacher",teacher.getRealName());
@@ -4017,8 +4013,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			case COMM:
 				CoursesGroup coursesGroup = coursesGroupDao.get(Long.parseLong(groupId));
 				resultMap.put("groupName",coursesGroup.getName());
-				resultMap.put("startTime",coursesGroup.getCoursesStartDate());
-				resultMap.put("endTime",coursesGroup.getCoursesEndDate());
 				resultMap.put("groupStatus",coursesGroup.getStatus().getCode());
 				teacher = teacherDao.get(coursesGroup.getTeacherId());
 				resultMap.put("groupTeacher",teacher.getRealName());
@@ -4030,6 +4024,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			default:
 				throw new BizException("课程类型错误");
 		}
+		resultMap.put("startTime",courseScheduleDao.getMinCourseTime(groupType, groupId));
+		resultMap.put("endTime",courseScheduleDao.getMaxCourseTime(groupType, groupId));
 		return resultMap;
 	}
 

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

@@ -254,11 +254,11 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                 groupCard.setGroupType(GroupType.COMM);
                 groupCard.setName(teacherCourseGroup.getName());
                 groupCard.setSingleClassMinutes(teacherCourseGroup.getSingleClassMinutes());
-                groupCard.setCoursesStartDate(teacherCourseGroup.getCoursesStartDate());
-                groupCard.setCoursesEndDate(teacherCourseGroup.getCoursesEndDate());
                 groupCard.setSubjectId(teacherCourseGroup.getSubjectId());
                 groupCard.setSubjectName(idSubjectMap.get(teacherCourseGroup.getSubjectId()).getName());
                 GroupCourseTimesDto groupCourseTimesInfo = groupCourseTimesInfoMap.get(String.valueOf(teacherCourseGroup.getId()));
+                groupCard.setCoursesStartDate(groupCourseTimesInfo.getStartDate());
+                groupCard.setCoursesEndDate(groupCourseTimesInfo.getEndDate());
                 groupCard.setClassGroupId(groupCourseTimesInfo.getClassGroupId());
                 groupCard.setTotalCourseTimes(groupCourseTimesInfo.getTotalCourseTimes());
                 groupCard.setSurplusClassTimes(groupCourseTimesInfo.getSurplusClassTimes());

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

@@ -2161,7 +2161,7 @@
           AND music_group_id_ = #{groupId}
     </select>
     <select id="getMaxCourseTime" resultType="java.util.Date">
-        SELECT MAX(CONCAT(class_date_, ' ', start_class_time_))
+        SELECT MAX(CONCAT(class_date_, ' ', end_class_time_))
         FROM course_schedule
         WHERE group_type_ = #{groupType}
           AND music_group_id_ = #{groupId}
@@ -2774,6 +2774,8 @@
         <result property="classGroupId" column="class_group_id_"/>
         <result property="totalCourseTimes" column="total_course_times_"/>
         <result property="surplusClassTimes" column="surplus_class_times_"/>
+        <result property="startDate" column="start_date_"/>
+        <result property="endDate" column="end_date_"/>
     </resultMap>
 
     <select id="findGroupsCourseTimesInfo" resultMap="GroupCourseTimesDto">
@@ -2782,7 +2784,9 @@
             cg.group_type_,
             cg.id_ class_group_id_,
             cg.total_class_times_ total_course_times_,
-            COUNT( cs.id_ ) surplus_class_times_
+            COUNT( cs.id_ ) surplus_class_times_,
+            MIN( CONCAT( class_date_, ' ', start_class_time_ ) ) start_date_,
+            MAX( CONCAT( class_date_, ' ', end_class_time_ ) ) end_date_
         FROM
             course_schedule cs
             LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_