|
|
@@ -133,6 +133,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
private TeacherCourseRewardService teacherCourseRewardService;
|
|
|
@Autowired
|
|
|
private StudentDao studentDao;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationDao organizationDao;
|
|
|
|
|
|
private static final Logger LOGGER = LoggerFactory
|
|
|
.getLogger(VipGroup.class);
|
|
|
@@ -419,7 +421,45 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
|
|
|
return vipGroupApplyBaseInfoDto.getAuditStatus().getCode();
|
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
+ @Override
|
|
|
+ public List<Organization> getPublicOrgans(Integer eduTeacherId, Integer teacherId) {
|
|
|
+ if(Objects.isNull(eduTeacherId)){
|
|
|
+ throw new BizException("教务老师不存在");
|
|
|
+ }
|
|
|
+ if(Objects.isNull(teacherId)){
|
|
|
+ throw new BizException("请指定指导老师");
|
|
|
+ }
|
|
|
+ Employee employee = employeeDao.get(eduTeacherId);
|
|
|
+ if(Objects.isNull(employee)){
|
|
|
+ throw new BizException("教务老师不存在");
|
|
|
+ }
|
|
|
+ Teacher teacher = teacherDao.get(teacherId);
|
|
|
+ if(Objects.isNull(teacher)){
|
|
|
+ throw new BizException("指导老师不存在");
|
|
|
+ }
|
|
|
+ List<Integer> employeeOrganIds=new ArrayList<>();
|
|
|
+ if(StringUtils.isNotBlank(employee.getOrganIdList())){
|
|
|
+ employeeOrganIds= Arrays.stream(employee.getOrganIdList().split(",")).map(e->Integer.valueOf(e)).collect(Collectors.toList());
|
|
|
+ }
|
|
|
+ List<Integer> teacherOrganIds=new ArrayList<>();
|
|
|
+ if(Objects.nonNull(teacher.getOrganId())){
|
|
|
+ teacherOrganIds.add(teacher.getOrganId());
|
|
|
+ }
|
|
|
+ if(StringUtils.isNotBlank(teacher.getFlowOrganRangeId())){
|
|
|
+ Arrays.stream(teacher.getFlowOrganRangeId().split(","))
|
|
|
+ .map(e->Integer.valueOf(e)).collect(Collectors.toSet())
|
|
|
+ .forEach(organId->{
|
|
|
+ teacherOrganIds.add(organId);
|
|
|
+ });
|
|
|
+ }
|
|
|
+ List<Integer> publicOrganIds = employeeOrganIds.stream().filter(employeeOrganId -> teacherOrganIds.contains(employeeOrganId)).collect(Collectors.toList());
|
|
|
+ if(CollectionUtils.isEmpty(publicOrganIds)){
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+ return organizationDao.findOrgans(publicOrganIds);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void checkVipCourseIsInScore(Long vipGroupId) {
|
|
|
if(Objects.isNull(vipGroupId)){
|
zouxuan