解决修改后的部分冲突

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

@@ -1,8 +1,8 @@
 package com.ym.mec.web.dal.dao;
 
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.web.dal.entity.CourseSchedule;
-import com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity;
 import org.apache.ibatis.annotations.Param;
 
 public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
@@ -12,5 +12,5 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param teacherID
      * @return
      */
-    TeacherAttendanceViewUtilEntity getCurrentCourseDetail(@Param("teacherID") Long teacherID);
+    TeacherAttendanceDto getCurrentCourseDetail(@Param("teacherID") Long teacherID);
 }

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

@@ -1,9 +1,8 @@
 package com.ym.mec.web.service;
 
 import com.ym.mec.common.service.BaseService;
-import com.ym.mec.web.dal.entity.CourseSchedule;
-import com.ym.mec.web.dal.dto.StudentAttendanceViewDto;
 import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
+import com.ym.mec.web.dal.entity.CourseSchedule;
 
 public interface CourseScheduleService extends BaseService<Long, CourseSchedule> {
 
@@ -12,13 +11,5 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
      * @Date: 2019/9/10
      * 根据课程ID获取当前课程的信息
      */
-    TeacherAttendanceDto getCurrentCourseDetail(Integer teacherId);
-
-    /**
-     * @Author: Joburgess
-     * @Date: 2019/9/11
-     * 根据班级ID获取当前课程的学生
-     */
-    List<StudentAttendanceViewDto> getCurrentCourseStudents(Long classID);
-
+    TeacherAttendanceDto getCurrentCourseDetail(Long teacherId);
 }

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

@@ -1,16 +1,11 @@
 package com.ym.mec.web.service.impl;
 
-import com.ym.mec.web.dal.dto.StudentAttendanceViewDto;
-import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.web.dal.dao.CourseScheduleDao;
+import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
 import com.ym.mec.web.dal.entity.CourseSchedule;
 import com.ym.mec.web.dal.enums.ParamEnum;
-import com.ym.mec.web.dal.utilEntity.TeacherAttendanceViewUtilEntity;
 import com.ym.mec.web.service.CourseScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,15 +24,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
-	public TeacherAttendanceViewUtilEntity getCurrentCourseDetail(Long teacherId) {
-		TeacherAttendanceViewUtilEntity currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherId);
+	public TeacherAttendanceDto getCurrentCourseDetail(Long teacherId) {
+		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherId);
 		currentCourseDetail.setCurrentTime(new Date());
 		currentCourseDetail.setTeacherAttendanceTimeGap(ParamEnum.TEACHER_ATTENDANCE_TIME_GAP);
 		return currentCourseDetail;
 	}
-
-	@Override
-	public List<StudentAttendanceViewDto> getCurrentCourseStudents(Long classID) {
-		return courseScheduleDao.getCurrentCourseStudents(classID);
-	}
 }