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

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

@@ -719,7 +719,7 @@ public class EduPracticeGroupServiceImpl implements EduPracticeGroupService{
         WeekFields weekFields = WeekFields.of(DayOfWeek.MONDAY, 1);
         ZoneId zoneId = ZoneId.systemDefault();
 
-        LocalDate monday = LocalDateTime.parse(mondayStr, ddf).toLocalDate();
+        LocalDate monday = LocalDate.parse(mondayStr, ddf);
         LocalDate sunday = monday.with(weekFields.dayOfWeek(), DayOfWeek.SUNDAY.getValue());
 
         Map<Integer, List<String>> weekNumApplyTimesMap = getEnableApplyDatesWithWeek();

mec-web/src/main/java/com/ym/mec/web/controller/education/EduPracticeGroupController.java

@@ -217,18 +217,18 @@ public class EduPracticeGroupController extends BaseController {
 
     @ApiOperation("获取指定教师的空闲时间——试听")
     @GetMapping(value = "/getTrialPracticeTeacherFreeTimes")
-    public HttpResponseResult getTrialPracticeTeacherFreeTimes(Integer userId, Integer teacherId, String monday){
+    public HttpResponseResult getTrialPracticeTeacherFreeTimes(Integer studentId, Integer teacherId, String monday){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        if(Objects.isNull(userId)){
+        if(Objects.isNull(studentId)){
             return failed("请指定学生");
         }
         if(Objects.isNull(teacherId)){
             return failed("请指定教师");
         }
-        return succeed(eduPracticeGroupService.getTrialPracticeTeacherFreeTimes(userId, teacherId, monday));
+        return succeed(eduPracticeGroupService.getTrialPracticeTeacherFreeTimes(studentId, teacherId, monday));
     }
 
     @ApiOperation("创建网管试听课")