1、陪练课名称生成逻辑调整

2、一个部门下只有一节课成导致的可预约日期异常

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

@@ -237,7 +237,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             Map<Integer, List<CourseSchedule>> teacherCoursesMap = allTeacherCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getActualTeacherId));
             for (Integer teacherId : teacherIds) {
-
+                if(Objects.nonNull(organTeacherLeaveData)){
+                    checkTeacherLeaveDate=true;
+                }
                 JSONObject teacherLeaveData=null;
                 if(checkTeacherLeaveDate){
                     teacherLeaveData=organTeacherLeaveData.getJSONObject(teacherId.toString());
@@ -471,7 +473,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             Map<Integer, List<CourseSchedule>> teacherCoursesMap = allTeacherCourses.stream().collect(Collectors.groupingBy(CourseSchedule::getActualTeacherId));
             for (Integer teacherId : teacherIds) {
-
+                if(Objects.nonNull(organTeacherLeaveData)){
+                    checkTeacherLeaveDate=true;
+                }
                 JSONObject teacherLeaveData=null;
                 if(checkTeacherLeaveDate){
                     teacherLeaveData=organTeacherLeaveData.getJSONObject(teacherId.toString());
@@ -741,10 +745,14 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 if (excludeTeacherIds.contains(teacherId)) {
                     continue;
                 }
+                if(Objects.nonNull(organTeacherLeaveData)){
+                    checkTeacherLeaveDate=true;
+                }
                 JSONObject teacherLeaveData=null;
                 if(checkTeacherLeaveDate){
                     teacherLeaveData=organTeacherLeaveData.getJSONObject(teacherId.toString());
                 }
+
                 if(Objects.isNull(teacherLeaveData)){
                     checkTeacherLeaveDate=false;
                 }
@@ -1239,5 +1247,4 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         result.put("status", "SUCCESS");
         return result;
     }
-
 }

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

@@ -305,6 +305,7 @@
             AND t.job_nature_='FULL_TIME'
             AND su.del_flag_=0 AND su.lock_flag_=0
             AND t.organ_id_!=36 AND t.organ_id_!=38
+            AND t.organ_id_!=7 AND t.organ_id_!=37
     </select>
     <select id="findTeacherByOrganAndSubject" resultMap="TeacherBasicDto">
         SELECT

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -15,7 +15,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author Joburgess
@@ -30,6 +33,7 @@ public class PracticeGroupController extends BaseController {
     private PracticeGroupService practiceGroupService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    List<Integer> excludeOrganIds=new ArrayList<>(Arrays.asList(new Integer[]{7,36,37,38}));
 
     @ApiOperation("获取学生的陪练课")
     @GetMapping(value = "/findUserPracticeCourses")
@@ -68,7 +72,7 @@ public class PracticeGroupController extends BaseController {
         if (sysUser == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        if(36==sysUser.getOrganId()){
+        if(excludeOrganIds.contains(sysUser.getOrganId())){
             throw new BizException("请联系老师确认您的所属分部");
         }
         practiceGroup.setStudentId(sysUser.getId());