乐团课凑结算问题修改

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

@@ -816,11 +816,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 School school = idSchoolMap.get(courseSchedule.getSchoolId());
                 if(school != null){
                     Boolean signInRange = false;
-                    if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignInLongitudeLatitude())){
+                    if(teacherAttendance.getSignInStatus() != null && teacherAttendance.getSignInStatus() == YesOrNoEnum.YES){
+                        signInRange = true;
+                    }else if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignInLongitudeLatitude())){
                         signInRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignInLongitudeLatitude(),attendanceRange);
                     }
                     Boolean signOutRange = false;
-                    if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
+                    if(teacherAttendance.getSignOutStatus() != null && teacherAttendance.getSignOutStatus() == YesOrNoEnum.YES){
+                        signInRange = true;
+                    }else if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
                         signOutRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignOutLongitudeLatitude(),attendanceRange);
                     }
                     if(!signInRange){
@@ -1711,11 +1715,15 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         if(teachMode == TeachModeEnum.OFFLINE){
             if(school != null){
                 Boolean signInRange = false;
-                if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignInLongitudeLatitude())){
+                if(teacherAttendance.getSignInStatus() != null && teacherAttendance.getSignInStatus() == YesOrNoEnum.YES){
+                    signInRange = true;
+                }else if(teacherAttendance != null && StringUtils.isNotEmpty(teacherAttendance.getSignInLongitudeLatitude())){
                     signInRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignInLongitudeLatitude(),attendanceRange);
                 }
                 Boolean signOutRange = false;
-                if(teacherAttendance != null || StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
+                if(teacherAttendance.getSignOutStatus() != null && teacherAttendance.getSignOutStatus() == YesOrNoEnum.YES){
+                    signInRange = true;
+                }else if(teacherAttendance != null || StringUtils.isNotEmpty(teacherAttendance.getSignOutLongitudeLatitude())){
                     signOutRange = getSignRange(school.getLongitudeLatitude(),teacherAttendance.getSignOutLongitudeLatitude(),attendanceRange);
                 }
                 if(!signInRange){