瀏覽代碼

1、添加教务老师字段
2、布置作业

Joburgess 5 年之前
父節點
當前提交
bfcd394e8e

+ 2 - 6
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;
 	}
 

+ 1 - 1
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}