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

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

@@ -638,14 +638,18 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             }else if(YesOrNoEnum.NO.equals(teacherAttendance.getSignOutStatus())){
                 int signOutCourseTimeBetweenSeconds = DateUtil.secondsBetween(teacherAttendance.getSignOutTime(), courseSchedule.getEndClassTime());
                 float signOutCourseTimeBetween = (float)signOutCourseTimeBetweenSeconds/(float) 60;
-                if(signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0){
+                if(signOutCourseTimeBetween>3){
                     //早退
                     deductCost = deductCost.add(teacherSalary);
                     deductReasons.add("早退扣除全部课酬");
-                }else{
+                }else if((signOutCourseTimeBetween<=3&&signOutCourseTimeBetween>0)||signOutCourseTimeBetween<3600){
                     //异常签退，扣除50元
                     deductCost = deductCost.add(new BigDecimal(50));
                     deductReasons.add("异常签退，扣除50元");
+                }else{
+                    //签退经纬度异常，扣除50元
+                    deductCost = deductCost.add(new BigDecimal(50));
+                    deductReasons.add("签退经纬度异常，扣除50元");
                 }
             }
 

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

@@ -393,20 +393,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
             hours = Integer.parseInt(str);
         }
 
-        int earliestTimeForLeave = 7;
-        SysConfig earliestTimeForLeaveConfig = sysConfigService.findByParamName(SysConfigService.EARLIEST_TIME_FOR_LEAVE);
-        if (Objects.nonNull(earliestTimeForLeaveConfig)) {
-            earliestTimeForLeave = Integer.parseInt(earliestTimeForLeaveConfig.getParanValue());
-        }
-
         if (DateUtil.addHours(date, hours).after(courseSchedule.getStartClassTime())) {
             throw new BizException("开课{}小时之前才可以请假", hours);
         }
 
-        if (DateUtil.addDays(DateUtils.truncate(date, Calendar.DAY_OF_MONTH), earliestTimeForLeave).compareTo(courseSchedule.getClassDate())<=0) {
-            throw new BizException("请在开课前{}天内请假", earliestTimeForLeave);
-        }
-
         StudentAttendance studentAttendance = studentAttendanceDao.findByStatusAndCourseScheduleId(userId, courseScheduleId.intValue());
         if (Objects.isNull(studentAttendance)) {
             studentAttendance = new StudentAttendance();