|
@@ -78,6 +78,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
//广州分部编号
|
|
|
private static final Integer GUANGZHOU_ORGAN_ID=3;
|
|
|
|
|
|
+ private static Map<Integer,String> subjectSubjectsMap=new HashMap<>();
|
|
|
+
|
|
|
static{
|
|
|
schoolSubjectTeachersMap=new HashMap<>();
|
|
|
Map<Integer,List<Integer>> subjectTeachersMap1=new HashMap<>();
|
|
@@ -118,6 +120,17 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
for (Integer schoolId : schoolIds3) {
|
|
|
schoolSubjectTeachersMap.put(schoolId,subjectTeachersMap3);
|
|
|
}
|
|
|
+
|
|
|
+ subjectSubjectsMap.put(2,"2");
|
|
|
+ subjectSubjectsMap.put(4,"4,5");
|
|
|
+ subjectSubjectsMap.put(5,"4,5");
|
|
|
+ subjectSubjectsMap.put(12,"12,13");
|
|
|
+ subjectSubjectsMap.put(13,"12,13");
|
|
|
+ subjectSubjectsMap.put(14,"14,15,16,17");
|
|
|
+ subjectSubjectsMap.put(15,"14,15,16,17");
|
|
|
+ subjectSubjectsMap.put(16,"14,15,16,17");
|
|
|
+ subjectSubjectsMap.put(17,"14,15,16,17");
|
|
|
+ subjectSubjectsMap.put(23,"23");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -151,7 +164,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), practiceGroup.getSubjectId());
|
|
|
+ List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), subjectSubjectsMap.get(practiceGroup.getSubjectId()));
|
|
|
if (CollectionUtils.isEmpty(organAndSubjectTeachers)) {
|
|
|
throw new BizException("未找到合适教师");
|
|
|
}
|
|
@@ -347,7 +360,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
throw new BizException("未找到用户分部属性");
|
|
|
}
|
|
|
Map result = new HashMap();
|
|
|
- List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), subjectId);
|
|
|
+ List<TeacherBasicDto> organAndSubjectTeachers = teacherDao.findTeaTeachersByOrganAndSubject(sysUser.getOrganId(), subjectSubjectsMap.get(subjectId));
|
|
|
if (CollectionUtils.isEmpty(organAndSubjectTeachers)) {
|
|
|
result.put("teacherFreeDates",new ArrayList<>());
|
|
|
return result;
|