Merge remote-tracking branch 'origin/master'

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

@@ -93,7 +93,7 @@ public interface StudentAttendanceService extends BaseService<Long, StudentAtten
 	 * 修复连堂课学生签到记录
 	 * @param month
 	 */
-    void repairStudentAttendance(Integer month);
+	void repairStudentAttendance(Integer month);
 
 	/**
 	 * 获取签到数据

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

@@ -578,6 +578,9 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 					studentAttendance.setStatus(statusEnum);
 					studentAttendance.setSignOutTime(date);
 				}
+			}else {
+				studentAttendance.setStatus(statusEnum);
+				studentAttendance.setSignOutTime(date);
 			}
 		}
 		studentAttendanceDao.update(studentAttendance);

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

@@ -98,12 +98,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 		List<Student> labeledStudentList = studentDao.queryByOperatingTempTag(1);
 		for(Student s : labeledStudentList){
 			dto = map.get(s.getUserId());
-			if(dto != null){
-				if(dto.getTotalCourseTimes() == dto.getFreePracticeCourseTimes()){
-					s.setOperatingTempTag(0);
-					s.setOperatingTag(0);
-					updateStudentList.add(s);
-				}
+			if (dto == null || dto.getTotalCourseTimes() == dto.getFreePracticeCourseTimes()) {
+				s.setOperatingTempTag(0);
+				s.setOperatingTag(0);
+				updateStudentList.add(s);
 			}
 		}
 		

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

@@ -345,7 +345,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 								continue;
 							}
 							if(i < courseSchedules.size() - 1 && date.after(endDateTime)){
-							//不是最后一节连堂课，并且签退时间大于课程结束时间，签退时间等于课程结束时间
+								//不是最后一节连堂课，并且签退时间大于课程结束时间，签退时间等于课程结束时间
 								signOutTime = endDateTime;
 							}
 							//如果签退时间大于课程结束时间
@@ -381,6 +381,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				}
 			}else {
 				teacherAttendance.setSignOutStatus(YesOrNoEnum.NO);
+				teacherAttendance.setSignOutTime(date);
 			}
 			teacherAttendanceDao.update(teacherAttendance);
 		}