Merge remote-tracking branch 'origin/master'

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

@@ -1017,7 +1017,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(classGroupId);
             teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
         }
-
+        if (classGroup.getType() == ClassGroupTypeEnum.PRACTICE) {
+            String[] studentNums = classGroupStudentMapperDao.findStudentNumByClassGroupId(classGroupId);
+            teacherClassHeadInfo.setStudentNames(StringUtils.join(studentNums, ","));
+        }
         return teacherClassHeadInfo;
     }
 

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

@@ -341,8 +341,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 						if(totalMinutes >= 0){
 							//补充签到签退时间
 							courseClassDate = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
-							courseStartDateTime = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
-							courseEndDateTime = DateUtil.format(e.getClassDate(), DateUtil.DEFAULT_PATTERN);
+							courseStartDateTime = DateUtil.format(e.getStartClassTime(), DateUtil.DEFAULT_PATTERN);
+							courseEndDateTime = DateUtil.format(e.getEndClassTime(), DateUtil.DEFAULT_PATTERN);
 							Date startDateTime = DateUtil.stringToDate(courseClassDate + " " + courseStartDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
 							Date endDateTime = DateUtil.stringToDate(courseClassDate + " " + courseEndDateTime, DateUtil.EXPANDED_DATE_TIME_FORMAT);
 							teacherAttendanceDao.cuntinueCourseSign(e.getId(),startDateTime,endDateTime);

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

@@ -2209,7 +2209,7 @@
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_
         WHERE (UNIX_TIMESTAMP(CONCAT(cs.class_date_,' ',cs.start_class_time_)) -
         UNIX_TIMESTAMP(CONCAT(#{courseSchedule.classDate},' ',#{courseSchedule.endClassTime}))) >= 60 * #{continueCourseTime}
-        AND cs.teacher_id_ = #{courseSchedule.teacherId} AND cs.class_group_id_ = #{courseSchedule.courseScheduleId}
+        AND cs.teacher_id_ = #{courseSchedule.teacherId} AND cs.class_group_id_ = #{courseSchedule.id}
         AND ta.sign_in_time_ IS NULL AND ta.sign_out_time_ IS NULL
     </select>
     <select id="getSingleClassMinutes" resultType="java.lang.Integer">

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

@@ -68,6 +68,6 @@
 				AND (subject_id_ = #{subjectId} OR subject_id_ IS NULL)
 			</if>
 		</where>
-		ORDER BY order_ DESC
+		ORDER BY order_ ASC
 	</select>
 </mapper>