zouxuan 2 年之前
父节点
当前提交
679b205a6f

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

@@ -1231,7 +1231,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					List<TeacherAttendanceWrapper.CourseTeacherAttendance> attendanceList = classMap.get(dto.getClassGroupId());
 					if(CollectionUtils.isNotEmpty(attendanceList)){
 						dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.NORMAL);
-						att:for (TeacherAttendanceWrapper.CourseTeacherAttendance attendance : attendances) {
+						att:for (TeacherAttendanceWrapper.CourseTeacherAttendance attendance : attendanceList) {
 							if(attendance.getSignInStatus() == 0 || attendance.getSignOutStatus() == 0){
 								dto.setTeacherAttendanceStatus(TeacherAttendanceQueryInfo.TeacherAttendanceEnum.ERR);
 								break att;

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -204,7 +204,7 @@
             <if test="enlightenmentCourseTime != null">
                 enlightenment_course_time_ = #{enlightenmentCourseTime},
             </if>
-            <if test="teamTeacherId != null">
+            <if test="directorUserId != null">
                 director_user_id_ = #{directorUserId},
             </if>
             <if test="parentMeetingTime != null">

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -665,7 +665,7 @@
         </where>
     </sql>
     <select id="queryTeacherAttendanceForWeek" resultType="com.ym.mec.biz.dal.wrapper.TeacherAttendanceWrapper$CourseTeacherAttendance">
-        select cs.actual_teacher_id_ actualTeacherId,cs.id_ courseScheduleId,cs.class_group_id_,
+        select cs.actual_teacher_id_ actualTeacherId,cs.id_ courseScheduleId,cs.class_group_id_ classGroupId,
         cs.status_ courseStatus,ta.sign_in_status_ signInStatus,ta.sign_out_status_ signOutStatus,cs.teach_mode_ teachMode,
                ta.sign_in_longitude_latitude_ signInLongitudeLatitude,ta.sign_out_longitude_latitude_ signOutLongitudeLatitude,cs.schoole_id_ schoolId
         from course_schedule cs