Merge remote-tracking branch 'origin/master'

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

@@ -17,5 +17,5 @@ public interface StudentDao extends com.ym.mec.common.dal.BaseDAO<Integer, Stude
     
     List<Student> queryByOperatingTag(Integer operatingTag);
     
-    int batchUpdate(List<Student> studentList);
+    int batchUpdate(@Param("studentList") List<Student> studentList);
 }

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

@@ -83,9 +83,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
 		List<Student> updateStudentList = new ArrayList<Student>();
 		StudentCourseTimesDto dto = null;
 		for(Student s : studentList){
-			dto = map.get(s.getUpdateTime());
+			dto = map.get(s.getUserId());
 			if(dto != null){
 				if(dto.getTotalCourseTimes() != dto.getFreePracticeCourseTimes()){
+					s.setOperatingTag(1);
 					updateStudentList.add(s);
 				}
 			}

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

@@ -2960,7 +2960,7 @@
         WHERE cs.class_group_id_ = #{classGroupId}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) <= #{continueCourseTime}
         AND TIMESTAMPDIFF(MINUTE, CONCAT(cs.class_date_," ",cs.end_class_time_),#{startTime}) >= 0
-        AND cs.actual_teacher_id_ = #{teacherId}
+        AND cs.actual_teacher_id_ = #{teacherId} AND CONCAT(cs.class_date_," ",cs.end_class_time_) > NOW()
         ORDER BY cs.class_date_ DESC,cs.end_class_time_ DESC
         LIMIT 1
     </select>