Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into test

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

@@ -143,7 +143,7 @@ public class LessonExaminationServiceImpl extends ServiceImpl<LessonExaminationD
             if(CollectionUtils.isNotEmpty(musicGroupIds)){
                 musicGroupNameMap = MapUtil.convertIntegerMap(musicGroupDao.queryMusicGroupNameMap(musicGroupIds));
             }
-            List<Long> examinationIds = dataList.stream().filter(e -> StringUtils.isEmpty(e.getMusicGroupId())).map(e -> e.getId()).collect(Collectors.toList());
+            List<Long> examinationIds = dataList.stream().map(e -> e.getId()).collect(Collectors.toList());
             Map<Long,String> nameMap = Collections.EMPTY_MAP;
             if(CollectionUtils.isNotEmpty(examinationIds)){
                 nameMap = MapUtil.convertMybatisMap(studentLessonExaminationService.getDao().getStudentName(examinationIds));

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

@@ -79,7 +79,7 @@
           (#{studentAttendance.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
           #{studentAttendance.musicGroupId},#{studentAttendance.classGroupId},#{studentAttendance.courseScheduleId},
           #{studentAttendance.userId},#{studentAttendance.teacherId},
-          #{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{leaveTime},now(),#{studentAttendance.updateTime},
+          #{studentAttendance.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{studentAttendance.leaveTime},now(),#{studentAttendance.updateTime},
           #{studentAttendance.remark},#{studentAttendance.currentClassTimes},
           #{studentAttendance.signInTime},#{studentAttendance.signOutTime},#{studentAttendance.currentScheduleId},
            #{studentAttendance.visitFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},