zouxuan преди 5 години
родител
ревизия
a3fe767a94

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

@@ -267,7 +267,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 		Date classEndDateAdd60Minutes = DateUtil.addMinutes(classEndDateTime, 60);
 		Date classEndDateCut10Minutes = DateUtil.addMinutes(classEndDateTime, -10);
 //		Date add20Minutes = DateUtil.addMinutes(classStartDateTime, advanceSignMinutes * -1);
-		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
+//		Date add60Minutes = DateUtil.addMinutes(classStartDateTime, -60);
 		//签到
 		if(teacherAttendance.getSignInTime() == null && SignStatusEnum.SIGN_IN.equals(signStatus)){
 			//是否连堂课
@@ -281,8 +281,8 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			boolean isSign = false;
 			if(yesOrNoEnum == YesOrNoEnum.YES){
 				isSign = true;
-			}else if(DateUtil.minutesBetween(add60Minutes,date) > 0 && DateUtil.minutesBetween(date,classStartDateTime) > 0){
-				//正常签到范围(开始前60分钟  ~  开始之前)
+			}else if(DateUtil.minutesBetween(date,classStartDateTime) > 0){
+				//正常签到范围(开始之前)
 				isSign = true;
 			}else if(DateUtil.minutesBetween(classStartDateTime,date) > 0){
 				//异常签到范围(开始之后)

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -50,7 +50,7 @@ public class CourseController extends BaseController {
         if(null == groupId){
             return failed("参数校验错误");
         }
-        return succeed(classGroupService.get(groupId));
+        return succeed(classGroupService.findGroupById(groupId));
     }
 
     @ApiOperation(value = "分页获取学员购买记录")