update

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

@@ -285,4 +285,15 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
      * @return java.util.List<com.ym.mec.biz.dal.entity.StudentAttendance>
      */
     List<StudentAttendance> getWithCoursesAndExcludeQuitStudent(@Param("courseIds") List<Long> courseIds);
+
+    /**
+     * @describe 获取学员连堂课第一次签到的课程
+     * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+     * @author zouxuan
+     * @date 2020/9/27
+     * @time 10:00
+     * @param courseScheduleId:
+     * @return java.lang.Long
+     */
+    Long findFirstSign(@Param("courseScheduleId") Long courseScheduleId, @Param("userId") Integer userId);
 }

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

@@ -256,5 +256,5 @@ public interface TeacherAttendanceDao extends BaseDAO<Long, TeacherAttendance> {
      * @param currentScheduleId:
      * @return java.lang.Long
      */
-	Long findFirstSign(Long currentScheduleId);
+	Long findFirstSign(@Param("currentScheduleId") Long currentScheduleId, @Param("userId") Integer userId);
 }

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

@@ -26,11 +26,13 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 	Map<String, Object> addTeacherAttendanceRecord(TeacherSignOutDto teacherSignOutDto);
 
 	/**
-	 * @describe 调价教师签到记录
-	 * @author Joburgess
-	 * @date 2019/11/4
-	 * @param courseScheduleId: 课程编号
-	 * @param userId: 用户编号
+	 * @describe 线上课老师签退
+	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
+	 * @author zouxuan
+	 * @date 2020/9/27
+	 * @time 9:52
+	 * @param courseScheduleId:
+	 * @param userId:
 	 * @return void
 	 */
 	void addTeacherAttendanceSignOut(Long courseScheduleId,
@@ -39,7 +41,7 @@ public interface TeacherAttendanceService extends BaseService<Long, TeacherAtten
 
 
 	/**
-	 * @describe 教室线上课签到
+	 * @describe 教师线上课签到
 	 * @apiNote 时光荏苒，认真工作的时间总是过得很快，而我、享受这一刻！
 	 * @author zouxuan
 	 * @date 2020/9/26

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

@@ -545,7 +545,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
             courseEndDateTime = DateUtil.format(schedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
             Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
             //不是最后一节课
-            if(i != courseSchedules.size() - 1){
+            if(i == courseSchedules.size() - 1){
                 isBreak = upsetAttendance(userId,startDateTime,endDateTime,schedule,firstCourseId);
             }else {
                 isBreak = upsetAttendance(userId,startDateTime,date,schedule,firstCourseId);
@@ -556,7 +556,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
     public Boolean upsetAttendance(Integer userId,Date signInTime,Date signOutTime,CourseSchedule courseSchedule,Long courseScheduleId){
         StudentAttendance studentAttendance = studentAttendanceDao.findByStatusAndCourseScheduleId(userId, courseSchedule.getId().intValue());
         Boolean flag = false;
-        Long courseId = teacherAttendanceDao.findFirstSign(courseScheduleId);
+        Long courseId = studentAttendanceDao.findFirstSign(courseScheduleId,userId);
         //如果当前课程是第一次签到的课程那么不更新签到时间，并且退出下次循环
         if(courseId != null && courseId.equals(courseSchedule.getId())){
             flag = true;

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

@@ -352,7 +352,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	public Boolean upsetAttendance(Integer userId,Date signInTime,Date signOutTime,YesOrNoEnum status,CourseSchedule courseSchedule,Long courseScheduleId){
 		TeacherAttendance teacherAttendance = teacherAttendanceDao.findByTeacherAttendanceInfo(userId.longValue(),courseSchedule.getId());
 		Boolean flag = false;
-		Long courseId = teacherAttendanceDao.findFirstSign(courseScheduleId);
+		Long courseId = teacherAttendanceDao.findFirstSign(courseScheduleId,userId);
 		//如果当前课程是第一次签到的课程那么不更新签到时间，并且退出下次循环
 		if(courseId != null && courseId.equals(courseSchedule.getId())){
 			flag = true;

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

@@ -509,4 +509,9 @@
             #{courseId}
         </foreach>
     </select>
+    <select id="findFirstSign" resultType="java.lang.Long">
+        SELECT sa.course_schedule_id_ FROM student_attendance sa
+        WHERE sa.current_schedule_id_ = #{currentScheduleId} AND sa.user_id_ = #{userId}
+        AND sa.sign_in_time_ IS NOT NULL ORDER BY sa.sign_in_time_ ASC LIMIT 1
+    </select>
 </mapper>

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

@@ -535,7 +535,8 @@
     </select>
     <select id="findFirstSign" resultType="java.lang.Long">
         SELECT ta.course_schedule_id_ FROM teacher_attendance ta
-        WHERE ta.current_schedule_id_ = #{currentScheduleId} AND ta.sign_in_time_ IS NOT NULL ORDER BY ta.sign_in_time_ ASC LIMIT 1
+        WHERE ta.current_schedule_id_ = #{currentScheduleId} AND ta.teacher_id_ = #{userId}
+        AND ta.sign_in_time_ IS NOT NULL ORDER BY ta.sign_in_time_ ASC LIMIT 1
     </select>
 
     <update id="updateViPSignOutStatus" parameterType="string">

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -17,9 +17,9 @@ public interface RoomService {
 
     Boolean kickMember(String roomId) throws Exception;
 
-    public void joinRoomSuccess(String roomId,String userId) throws Exception;
+    void joinRoomSuccess(String roomId,String userId) throws Exception;
 
-    public void leaveRoomSuccess(String roomId,String userId) throws Exception;
+    void leaveRoomSuccess(String roomId,String userId) throws Exception;
 
     //only teacher
     Boolean display(String roomId, int type, String uri, String userId) throws Exception;