Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -141,7 +141,7 @@ public interface StudentAttendanceDao extends BaseDAO<Long, StudentAttendance> {
     int countByCourseSchedule(Long courseScheduleId);
 
     /**
-     * @describe 统计每节课上的学生数
+     * @describe 统计每节课上的学生数，排除学员自己请假的记录
      * @author Joburgess
      * @date 2019/12/26
      * @param courseScheduleIds:

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

@@ -214,7 +214,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			}else if(StringUtils.isNotBlank(teacherSignOutDto.getTeacherAttendanceInfo().getSignOutLongitudeLatitude())){
 				SysConfig sysConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE);
 				double attendanceRange = Double.valueOf(sysConfig.getParanValue());
-				double distance = MapUtil.distance(teacherSignOutDto.getTeacherAttendanceInfo().getSignInLongitudeLatitude(),
+				double distance = MapUtil.distance(teacherSignOutDto.getTeacherAttendanceInfo().getSignOutLongitudeLatitude(),
 						school.getLongitudeLatitude());
 				if(distance<=attendanceRange){
 					isInScore=true;
@@ -538,7 +538,9 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		TeacherAttendance teacherAttendanceInfo = teacherAttendanceDao.findByTeacherAttendanceInfo(userId.longValue(), courseScheduleId.longValue());
 		teacherSignDetail.setTeacherAttendanceInfo(teacherAttendanceInfo);
 		CourseHomework courseHomewok = courseHomeworkDao.findByCourseSchedule(courseScheduleId.longValue());
-		courseHomewok.setAttachments(teacherAttendanceInfo.getSignOutAttachments());
+		if(Objects.nonNull(teacherAttendanceInfo)&&Objects.nonNull(courseHomewok)){
+			courseHomewok.setAttachments(teacherAttendanceInfo.getSignOutAttachments());
+		}
 		teacherSignDetail.setCourseHomeworkInfo(courseHomewok);
 		return teacherSignDetail;
 	}

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

@@ -437,6 +437,7 @@
             <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
                 #{courseScheduleId}
             </foreach>
+            AND remark_ IS NULL
         GROUP BY
             course_schedule_id_
     </select>