Merge remote-tracking branch 'origin/master'

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

@@ -84,7 +84,7 @@ public class StudentServeServiceImpl implements StudentServeService {
                 noClassStudentIds.add(studentCoursesEntry.getKey());
                 continue;
             }
-            if(studentServeDto.getCourseStartTime().after(nextMonday)){
+            if(!nextMonday.before(studentServeDto.getCourseStartTime())){
                 dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
                 continue;
             }

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

@@ -689,17 +689,25 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			throw new BizException("考勤信息不存在");
 		}
 		if(teacherAttendance.getComplaintsStatus() == ComplaintsStatusEnum.WAIT){
-			if(signInStatus != null){
+			CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
+			String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+			if(signInStatus != null && teacherAttendance.getSignInStatus() != YesOrNoEnum.YES){
+				String startTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+				Date date = DateUtil.stringToDate(classDate + ' ' + startTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+				teacherAttendance.setSignInTime(DateUtil.addMinutes(date,1));
 				teacherAttendance.setSignInStatus(YesOrNoEnum.YES);
 			}
-			if(signOutStatus != null){
+			if(signOutStatus != null && teacherAttendance.getSignOutStatus() != YesOrNoEnum.YES){
+				String endTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+				Date date = DateUtil.stringToDate(classDate + ' ' + endTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
+				teacherAttendance.setSignOutTime(date);
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.YES);
 			}
 			teacherAttendance.setDisposeContent(content);
 			teacherAttendance.setOperator(user.getId());
 			teacherAttendance.setComplaintsStatus(ComplaintsStatusEnum.PASS);
+			teacherAttendance.setRemark("同意异常考勤申述");
 			teacherAttendanceDao.update(teacherAttendance);
-			CourseSchedule courseSchedule = courseScheduleDao.get(teacherAttendance.getCourseScheduleId());
 			String format = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
 			Map<Integer, String> receivers = new HashMap<>(1);
 			receivers.put(user.getId(),user.getId().toString());

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

@@ -721,7 +721,6 @@
         WHERE (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
           AND cs.class_date_ = DATE_FORMAT(#{classDate}, '%Y%m%d')
           AND csts.user_id_ = #{teacherId}
-          AND cg.del_flag_ = 0
           AND CONCAT(cs.class_date_, ' ', cs.end_class_time_) < NOW()
         ORDER BY start_class_time_
     </select>

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

@@ -895,6 +895,7 @@
 			AND csts.settlement_time_ IS NOT NULL
 			AND csts.user_id_ = #{teacherId}
 			AND DATE_FORMAT( cs.class_date_, '%Y' ) = #{year}
+			AND DATE_FORMAT(cs.class_date_, '%Y-%m')<DATE_FORMAT(NOW(), '%Y-%m')
 		GROUP BY DATE_FORMAT( cs.class_date_, '%Y-%m' )
 	</select>
 	<select id="findTeacherSalaryIdsWithMonth" resultType="java.lang.Long">

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

@@ -395,10 +395,11 @@
             s.teacher_id_,
             cs.group_type_,
             cs.teach_mode_,
-            CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) course_start_time_
+            IF(CONCAT( cs.class_date_, ' ', cs.end_class_time_ )<NOW() AND sa.id_ IS NULL, NULL, cs.class_date_) course_start_time_
         FROM
             student s
             LEFT JOIN course_schedule_student_payment cssp ON cssp.user_id_ = s.user_id_
+	        LEFT JOIN student_attendance sa ON cssp.course_schedule_id_=sa.course_schedule_id_ AND sa.user_id_=cssp.user_id_
             LEFT JOIN course_schedule cs ON cs.id_ = cssp.course_schedule_id_
             AND cs.group_type_ IN ('VIP', 'PRACTICE')
             AND CONCAT( cs.class_date_, ' ', cs.start_class_time_ ) > #{monday}