|
|
@@ -10,11 +10,9 @@ import com.ym.mec.biz.dal.entity.CourseSchedule;
|
|
|
import com.ym.mec.biz.dal.entity.Employee;
|
|
|
import com.ym.mec.biz.dal.entity.MusicGroup;
|
|
|
import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
|
|
|
+import com.ym.mec.biz.dal.enums.SysUserRoleEnum;
|
|
|
import com.ym.mec.biz.dal.page.MusicGroupQueryInfo;
|
|
|
-import com.ym.mec.biz.service.MusicGroupPaymentCalenderDetailService;
|
|
|
-import com.ym.mec.biz.service.MusicGroupService;
|
|
|
-import com.ym.mec.biz.service.OnlineMusicGroupService;
|
|
|
-import com.ym.mec.biz.service.StudentRegistrationService;
|
|
|
+import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
@@ -49,7 +47,9 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
@Autowired
|
|
|
private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
|
|
|
@Autowired
|
|
|
- private EmployeeDao employeeDao;
|
|
|
+ private SysEmployeePositionService employeePositionService;
|
|
|
+ @Autowired
|
|
|
+ private OrganizationService organizationService;
|
|
|
|
|
|
@ApiOperation(value = "分页查询维修技师所在乐团列表")
|
|
|
@GetMapping("/findMusicGroups")
|
|
|
@@ -58,22 +58,12 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
if (sysUser == null) {
|
|
|
return failed("用户信息获取失败");
|
|
|
}
|
|
|
- List<Integer> userRole = employeeDao.queryUserRole(sysUser.getId());
|
|
|
+ Boolean onlyForRole = employeePositionService.onlyForRole(SysUserRoleEnum.REPAIR, sysUser.getId(), sysUser.getIsSuperAdmin());
|
|
|
//如果当前用户只有维修技师角色，那么只能看到他所管理的课程组的信息
|
|
|
- if (!sysUser.getIsSuperAdmin() && userRole.size() == 1 && userRole.contains(SysUserRole.REPAIR)) {
|
|
|
+ if (onlyForRole) {
|
|
|
queryInfo.setRepairUserId(sysUser.getId());
|
|
|
}else {
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- }else if(StringUtils.isEmpty(employee.getOrganIdList())){
|
|
|
- return failed("用户所在分部异常");
|
|
|
- }else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
|
|
|
- return failed("非法请求");
|
|
|
- }
|
|
|
- }
|
|
|
+ queryInfo.setOrganId(organizationService.getEmployeeOrgan(sysUser.getId(), queryInfo.getOrganId(), sysUser.getIsSuperAdmin()));
|
|
|
}
|
|
|
queryInfo.setStatus(MusicGroupStatusEnum.PROGRESS);
|
|
|
return succeed(musicGroupService.findEduTeacherMusicGroups(queryInfo));
|
|
|
@@ -81,14 +71,12 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "获取乐团下所有学员身上的声部列表")
|
|
|
@GetMapping("/findMusicGroupAllStudentSubjects")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/findMusicGroupAllStudentSubjects')")
|
|
|
public HttpResponseResult findMusicGroupAllStudentSubjects(String musicGroupId){
|
|
|
return succeed(studentRegistrationService.findMusicGroupAllStudentSubjects(musicGroupId));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "根据声部获取乐团下完成缴费的学员")
|
|
|
@GetMapping("/findMusicGroupStudentWithSubject")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/findMusicGroupStudentWithSubject')")
|
|
|
public HttpResponseResult findMusicGroupStudentWithSubject(String musicGroupId,Integer subjectId){
|
|
|
if(Objects.isNull(subjectId)){
|
|
|
return failed("请指定声部");
|
|
|
@@ -98,7 +86,6 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "获取可选择的教师")
|
|
|
@GetMapping("/getEnableApplyTeachers")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/getEnableApplyTeachers')")
|
|
|
public HttpResponseResult getEnableApplyTeachers(Integer studentId, Integer subjectId){
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
@@ -112,7 +99,6 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "获取教师空闲时间")
|
|
|
@GetMapping("/getTeacherFreeTimes")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/getTeacherFreeTimes')")
|
|
|
public HttpResponseResult getTeacherFreeTimes(Integer studentId, Integer teacherId, boolean skipHoliday) {
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
@@ -126,7 +112,6 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "检测学生是否存在进行中的乐团网管课")
|
|
|
@GetMapping("/checkStudentExistMusicNetwork")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/checkStudentExistMusicNetwork')")
|
|
|
public HttpResponseResult checkStudentExistMusicNetwork(Integer studentId){
|
|
|
int i = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(studentId, CourseSchedule.CourseScheduleType.MUSIC_NETWORK);
|
|
|
return succeed(i>0?1:0);
|
|
|
@@ -134,7 +119,6 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "创建乐团网管课")
|
|
|
@PostMapping("/createOnlineMusicClassGroup")
|
|
|
-// @PreAuthorize("@pcs.hasPermissions('eduOnlineMusic/createOnlineMusicClassGroup')")
|
|
|
public HttpResponseResult createOnlineMusicClassGroup(OnlineMusicGroupCourseDto onlineMusicGroupCourseInfo){
|
|
|
SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
if (sysUser == null) {
|
|
|
@@ -146,21 +130,7 @@ public class EduOnlineMusicGroupController extends BaseController {
|
|
|
@ApiOperation(value = "分页查询乐团列表")
|
|
|
@RequestMapping("/queryPage")
|
|
|
public Object queryPage(MusicGroupQueryInfo queryInfo) {
|
|
|
- SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
- if (sysUser == null) {
|
|
|
- return failed("用户信息获取失败");
|
|
|
- }
|
|
|
- Employee employee = employeeDao.get(sysUser.getId());
|
|
|
- if (StringUtils.isEmpty(queryInfo.getOrganId())) {
|
|
|
- queryInfo.setOrganId(employee.getOrganIdList());
|
|
|
- }else if(StringUtils.isEmpty(employee.getOrganIdList())){
|
|
|
- return failed("用户所在分部异常");
|
|
|
- }else {
|
|
|
- List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
|
|
|
- if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
|
|
|
- return failed("非法请求");
|
|
|
- }
|
|
|
- }
|
|
|
+ queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
|
|
|
return succeed(musicGroupService.queryMusicGroupPage(queryInfo));
|
|
|
}
|
|
|
|
hgw