上课签到部分处理逻辑调整

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

@@ -1,15 +1,19 @@
 package com.ym.mec.web.service.impl;
 
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.web.dal.dao.CourseScheduleDao;
 import com.ym.mec.web.dal.dao.TeacherAttendanceDao;
 import com.ym.mec.web.dal.dto.TeacherAttendanceDto;
+import com.ym.mec.web.dal.dto.TeacherPersonalAttendanceDto;
 import com.ym.mec.web.dal.entity.CourseSchedule;
 import com.ym.mec.web.dal.entity.TeacherAttendance;
 import com.ym.mec.web.dal.enums.CourseStatusEnum;
 import com.ym.mec.web.dal.enums.ParamEnum;
-import com.ym.mec.web.dal.enums.YesOrNoEnum;
+import com.ym.mec.web.dal.enums.SignStatusEnum;
+import com.ym.mec.web.dal.page.TeacherAttendanceQueryInfo;
 import com.ym.mec.web.service.TeacherAttendanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,7 +41,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		TeacherAttendanceDto currentCourseDetail = courseScheduleDao.getCurrentCourseDetail(teacherAttendance.getCourseScheduleId());
 		courseSchedule.setId(currentCourseDetail.getCourseScheduleId());
 		Date date = new Date();
-		if(teacherAttendance.getStatus()!= YesOrNoEnum.YES_QUIT){
+		if(teacherAttendance.getStatus()!= SignStatusEnum.YES_QUIT){
 			StringBuilder startClassDateTimeString=new StringBuilder(new SimpleDateFormat("yyyy-MM-dd").format(currentCourseDetail.getClassDate()));
 			startClassDateTimeString.append(" ");
 			startClassDateTimeString.append(new SimpleDateFormat("HH:mm:ss").format(currentCourseDetail.getStartClassTime()));
@@ -50,9 +54,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}
 			Long timeGap=(date.getTime()-startClassTime.getTime())/1000/60;
 			if(timeGap<= ParamEnum.TEACHER_ATTENDANCE_TIME_GAP.getCode()){
-				teacherAttendance.setStatus(YesOrNoEnum.YES);
+				teacherAttendance.setStatus(SignStatusEnum.SIGN);
 			}else{
-				teacherAttendance.setStatus(YesOrNoEnum.NO);
+				teacherAttendance.setStatus(SignStatusEnum.EXCEPTION);
 			}
 			courseSchedule.setStatus(CourseStatusEnum.UNDERWAY);
 		}else{