update

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -23,6 +23,13 @@ import java.util.List;
 import java.util.Map;
 
 public interface CourseScheduleService extends BaseService<Long, CourseSchedule> {
+	
+	/**
+	 * 查询课程信息
+	 * @param courseScheduleId
+	 * @return
+	 */
+	CourseSchedule queryById(Long courseScheduleId);
 
 	/**
 	 * @Author: Joburgess

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

@@ -254,6 +254,20 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
+	public CourseSchedule queryById(Long courseScheduleId) {
+    	CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId);
+    	if(courseSchedule != null){
+    		//查询助教列表
+    		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList =  courseScheduleTeacherSalaryDao.findByCourseSchedule(courseScheduleId);
+    		if(courseScheduleTeacherSalaryList != null){
+    			List<Integer> teacherIdList = courseScheduleTeacherSalaryList.stream().filter(t -> TeachTypeEnum.TEACHING.equals(t.getTeacherRole())).map(CourseScheduleTeacherSalary::getUserId).collect(Collectors.toList());
+    			courseSchedule.setTeachingTeacherIdList(teacherIdList);
+    		}
+    	}
+		return courseSchedule;
+	}
+
+	@Override
     public TeacherAttendanceDto getCurrentCourseDetail(Long courseID) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (null == user) {

mec-web/src/main/java/com/ym/mec/web/controller/CourseScheduleController.java

@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
 public class CourseScheduleController extends BaseController {
 
     @Autowired
-    private CourseScheduleService scheduleService;
+    private CourseScheduleService courseScheduleService;
     @Autowired
     private StudentAttendanceService studentAttendanceService;
     @Autowired
@@ -69,6 +69,37 @@ public class CourseScheduleController extends BaseController {
     @Autowired
     private VipGroupDao vipGroupDao;
 
+    @ApiOperation(value = "课表详情")
+    @GetMapping("/query")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/query')")
+    public Object query(Long courseScheduleId){
+        return succeed(courseScheduleService.queryById(courseScheduleId));
+    }
+
+    @ApiOperation(value = "终极课表获取")
+    @GetMapping("/superFindCourseSchedules")
+    @PreAuthorize("@pcs.hasPermissions('courseSchedule/superFindCourseSchedules')")
+    public Object superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        if(!sysUser.getIsSuperAdmin()){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
+                queryInfo.setOrganIdList(employee.getOrganIdList());
+            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
+                return failed("用户所在分部异常");
+            }else {
+                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
+                    return failed("非法请求");
+                }
+            }
+        }
+        return succeed(courseScheduleService.endFindCourseSchedules(queryInfo));
+    }
+
     @ApiOperation(value = "排课")
     @PostMapping("/batchAddCourseSchedule")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchAddCourseSchedule')")
@@ -103,7 +134,7 @@ public class CourseScheduleController extends BaseController {
             courseSchedule.setOrganId(musicGroup.getOrganId());
         });
 
-        scheduleService.createCourseSchedules(createCourseScheduleDto);
+        courseScheduleService.createCourseSchedules(createCourseScheduleDto);
         return succeed();
     }
 
@@ -112,7 +143,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchUpdateCourseSchedule')")
     public Object batchUpdateCourseSchedule(@RequestBody List<CourseSchedule> courseSchedules,
                                             @ApiParam(value = "乐团编号", required = true) @PathVariable("musicGroupID") String musicGroupID){
-        scheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
+        courseScheduleService.batchUpdateCourseSchedule(courseSchedules,musicGroupID);
         return succeed();
     }
 
@@ -125,7 +156,7 @@ public class CourseScheduleController extends BaseController {
         }
         long[] ints = Arrays.asList(courseScheduleIds.split(",")).stream().mapToLong(Long::parseLong).toArray();
         Long[] longs = ArrayUtils.toObject(ints);
-        scheduleService.batchDeleteCourseSchedules(Arrays.asList(longs));
+        courseScheduleService.batchDeleteCourseSchedules(Arrays.asList(longs));
         return succeed();
     }
 
@@ -133,7 +164,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping(value = "/findVipGroupCourseSchedules")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/findVipGroupCourseSchedules')")
     public Object findVipGroupCourseSchedules(VipGroupQueryInfo queryInfo){
-        return succeed(scheduleService.findVipGroupCourseSchedules(queryInfo));
+        return succeed(courseScheduleService.findVipGroupCourseSchedules(queryInfo));
     }
 
     @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
@@ -141,14 +172,14 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCourseScheduleDateByMonth')")
         public Object getCourseScheduleDateByMonth(@ApiParam(value = "乐团编号", required = true) @RequestParam Long musicGroupID,
                                                    @ApiParam(value = "月份", required = true) @RequestParam Date month) {
-        return succeed(scheduleService.getCourseScheduleDateByMonth(musicGroupID,month));
+        return succeed(courseScheduleService.getCourseScheduleDateByMonth(musicGroupID,month));
     }
 
     @ApiOperation(value = "根据课程ID查询正在或即将开始的课程")
     @GetMapping("/getCurrentCourseDetail/{courseID}")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/getCurrentCourseDetail')")
     public Object getCurrentCourseDetail(@ApiParam(value = "课程ID", required = true) @PathVariable("courseID") Long courseID){
-        return succeed(scheduleService.getCurrentCourseDetail(courseID));
+        return succeed(courseScheduleService.getCurrentCourseDetail(courseID));
     }
 
     @ApiOperation(value = "根据班级ID获取当前课程的学生")
@@ -162,7 +193,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/classStartDateAdjust','system')")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Object classStartDateAdjust(CourseSchedule courseSchedule){
-        CourseSchedule oldCourseSchedule = scheduleService.get(courseSchedule.getId());
+        CourseSchedule oldCourseSchedule = courseScheduleService.get(courseSchedule.getId());
         if(Objects.isNull(oldCourseSchedule)){
             return failed("未找到指定课程");
         }
@@ -179,7 +210,7 @@ public class CourseScheduleController extends BaseController {
         }
         List<CourseSchedule> courseSchedules=new ArrayList<>();
         courseSchedules.add(courseSchedule);
-        scheduleService.courseAdjust(courseSchedules);
+        courseScheduleService.courseAdjust(courseSchedules);
         return succeed();
     }
 
@@ -187,7 +218,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/classGroupTeacherAdjust','system')")
     @PostMapping(value = "/classGroupTeacherAdjust")
     public Object classGroupTeacherAdjust(String classGroupIds,Integer teacherId,Integer targetTeacherId){
-        scheduleService.classGroupTeacherAdjust(classGroupIds,teacherId,targetTeacherId);
+        courseScheduleService.classGroupTeacherAdjust(classGroupIds,teacherId,targetTeacherId);
         return succeed();
     }
 
@@ -195,7 +226,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchClassStartDateAdjust')")
     @PostMapping(value = "/batchClassStartDateAdjust")
     public Object batchClassStartDateAdjust(@RequestBody List<CourseSchedule> courseSchedules){
-        scheduleService.courseAdjust(courseSchedules);
+        courseScheduleService.courseAdjust(courseSchedules);
         return succeed();
     }
 
@@ -206,7 +237,7 @@ public class CourseScheduleController extends BaseController {
         if(Objects.isNull(courseScheduleId1)||Objects.isNull(courseScheduleId2)){
             return failed("请指定课程");
         }
-        scheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
+        courseScheduleService.courseSwap(courseScheduleId1,courseScheduleId2);
         return succeed();
     }
 
@@ -214,7 +245,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping(value = "/courseScheduleCommplaintAudit")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/courseScheduleCommplaintAudit')")
 	public Object courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status) {
-		scheduleService.courseScheduleCommplaintAudit(id, teacherLiabilityRatio, studentLiabilityRatio, status);
+		courseScheduleService.courseScheduleCommplaintAudit(id, teacherLiabilityRatio, studentLiabilityRatio, status);
 		return succeed();
 	}
 
@@ -222,7 +253,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping(value = "/checkMusicGroupClassCourse")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/checkMusicGroupClassCourse')")
     public Object checkMusicGroupClassCourse(String musicGroupId){
-        scheduleService.checkMusicGroupClassCourse(musicGroupId);
+        courseScheduleService.checkMusicGroupClassCourse(musicGroupId);
         return succeed();
     }
 
@@ -237,7 +268,7 @@ public class CourseScheduleController extends BaseController {
     @GetMapping("/batchDeleteMusicGroupNotStartCourse")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchDeleteMusicGroupNotStartCourse')")
 	public Object batchDeleteMusicGroupNotStartCourse(String musicGroupId){
-        scheduleService.batchDeleteMusicGroup(musicGroupId,GroupType.MUSIC);
+        courseScheduleService.batchDeleteMusicGroup(musicGroupId,GroupType.MUSIC);
         return succeed();
     }
 
@@ -252,7 +283,7 @@ public class CourseScheduleController extends BaseController {
     @GetMapping("/findCourseScheduleByClassGroup")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/findCourseScheduleByClassGroup')")
 	public Object findCourseScheduleByClassGroup(Integer classGroupId){
-        return succeed(scheduleService.findCourseScheduleByClassGroup(classGroupId));
+        return succeed(courseScheduleService.findCourseScheduleByClassGroup(classGroupId));
     }
     
     @ApiOperation(value = "查询课程投诉详情")
@@ -267,7 +298,7 @@ public class CourseScheduleController extends BaseController {
     	SysUser user = sysUserFeignService.queryUserById(complaints.getUserId());
     	complaints.getUser().setUsername(user.getUsername());
     	
-    	CourseSchedule courseSchedule = scheduleService.get(complaints.getCourseScheduleId());
+    	CourseSchedule courseSchedule = courseScheduleService.get(complaints.getCourseScheduleId());
     	SysUser teacher = sysUserFeignService.queryUserById(courseSchedule.getActualTeacherId());
     	courseSchedule.getTeacher().setUsername(teacher.getUsername());
     	
@@ -282,7 +313,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/vipCourseAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/vipCourseAdjust')")
     public Object vipCourseAdjust(@RequestBody VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo){
-        scheduleService.vipCourseAdjust(vipGroupCourseAdjustInfo);
+        courseScheduleService.vipCourseAdjust(vipGroupCourseAdjustInfo);
         return succeed();
     }
 
@@ -290,7 +321,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/batchUpdateCourseSchedule")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchUpdateCourseSchedule')")
     public Object batchUpdateCourseSchedule(@RequestBody BatchInsertCoursesDto batchInsertCoursesDto){
-        scheduleService.batchUpdateCourseSchedule(batchInsertCoursesDto);
+        courseScheduleService.batchUpdateCourseSchedule(batchInsertCoursesDto);
         return succeed();
     }
 
@@ -298,7 +329,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/batchAppendVipGroupCourses")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchAppendVipGroupCourses')")
     public Object batchAppendVipGroupCourses(@RequestBody VipGroupCourseAdjustInfoDto vipGroupCourseAdjustInfo){
-        scheduleService.batchAppendVipGroupCourses(vipGroupCourseAdjustInfo);
+        courseScheduleService.batchAppendVipGroupCourses(vipGroupCourseAdjustInfo);
         return succeed();
     }
 
@@ -316,41 +347,17 @@ public class CourseScheduleController extends BaseController {
     		}
     		batchInsertCoursesDto.setClassGroupId(classGroupList.get(0).getId());
     	}
-		scheduleService.batchAddCourseSchedule(batchInsertCoursesDto.getClassGroupId(), batchInsertCoursesDto.getCoursesTimes(),
+		courseScheduleService.batchAddCourseSchedule(batchInsertCoursesDto.getClassGroupId(), batchInsertCoursesDto.getCoursesTimes(),
 				batchInsertCoursesDto.getStartDate(), null,null, batchInsertCoursesDto.getTeachingArrangementList(), batchInsertCoursesDto.getTeachMode(),
 				batchInsertCoursesDto.getType(), batchInsertCoursesDto.getSchoolId(), batchInsertCoursesDto.getIsJumpHoliday());
         return succeed();
     }
 
-    @ApiOperation(value = "终极课表获取")
-    @GetMapping("/superFindCourseSchedules")
-    @PreAuthorize("@pcs.hasPermissions('courseSchedule/superFindCourseSchedules')")
-    public Object superFindCourseSchedules(EndCourseScheduleQueryInfo queryInfo){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            return failed("用户信息获取失败");
-        }
-        if(!sysUser.getIsSuperAdmin()){
-            Employee employee = employeeDao.get(sysUser.getId());
-            if (org.apache.commons.lang3.StringUtils.isEmpty(queryInfo.getOrganIdList())) {
-                queryInfo.setOrganIdList(employee.getOrganIdList());
-            }else if(org.apache.commons.lang3.StringUtils.isEmpty(employee.getOrganIdList())){
-                return failed("用户所在分部异常");
-            }else {
-                List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
-                if(!list.containsAll(Arrays.asList(queryInfo.getOrganIdList().split(",")))){
-                    return failed("非法请求");
-                }
-            }
-        }
-        return succeed(scheduleService.endFindCourseSchedules(queryInfo));
-    }
-
     @ApiOperation(value = "课程顺延")
     @PostMapping("/coursePostpone")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/coursePostpone')")
     public Object coursePostpone(CoursePostponeDto coursePostPoneInfo){
-        scheduleService.coursePostpone(coursePostPoneInfo);
+        courseScheduleService.coursePostpone(coursePostPoneInfo);
         return succeed();
     }
 
@@ -358,7 +365,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/practiceCourseAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceCourseAdjust')")
     public Object practiceCourseAdjust(CourseSchedule courseSchedule){
-        scheduleService.practiceCourseAdjust(courseSchedule);
+        courseScheduleService.practiceCourseAdjust(courseSchedule);
         return succeed();
     }
 
@@ -366,7 +373,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/practiceCourseTeacherAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceCourseTeacherAdjust')")
     public Object practiceCourseTeacherAdjust(Long courseScheduleId,Integer teacherId){
-        scheduleService.practiceCourseTeacherAdjust(courseScheduleId,teacherId);
+        courseScheduleService.practiceCourseTeacherAdjust(courseScheduleId,teacherId);
         return succeed();
     }
 
@@ -374,7 +381,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/practiceGroupTeacherAdjust")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/practiceGroupTeacherAdjust')")
     public Object practiceGroupTeacherAdjust(String practiceGroupId, Integer teacherId, Integer subjectId, Integer educationalTeacherId){
-        scheduleService.practiceGroupTeacherAdjust(practiceGroupId,teacherId,subjectId, educationalTeacherId);
+        courseScheduleService.practiceGroupTeacherAdjust(practiceGroupId,teacherId,subjectId, educationalTeacherId);
         return succeed();
     }
 
@@ -383,7 +390,7 @@ public class CourseScheduleController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/batchPracticeGroupTeacherAdjust')")
     @Transactional(rollbackFor = Exception.class)
     public Object batchPracticeGroupTeacherAdjust(String practiceGroupId, Integer teacherId, Integer subjectId, Integer educationalTeacherId,Integer oldTeacherId){
-        scheduleService.batchPracticeGroupTeacherAdjust(practiceGroupId,teacherId,subjectId,educationalTeacherId,oldTeacherId);
+        courseScheduleService.batchPracticeGroupTeacherAdjust(practiceGroupId,teacherId,subjectId,educationalTeacherId,oldTeacherId);
         return succeed();
     }
 
@@ -391,7 +398,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/updateCoursesExpireDate")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/updateCoursesExpireDate')")
     public Object updateCoursesExpireDate(String practiceGroupId,Date coursesExpireDate){
-        scheduleService.updateCoursesExpireDate(practiceGroupId,coursesExpireDate);
+        courseScheduleService.updateCoursesExpireDate(practiceGroupId,coursesExpireDate);
         return succeed();
     }
 
@@ -399,7 +406,7 @@ public class CourseScheduleController extends BaseController {
     @PostMapping("/cleanAttendance")
     @PreAuthorize("@pcs.hasPermissions('courseSchedule/cleanAttendance')")
     public Object cleanAttendance(String courseScheduleIds){
-        scheduleService.cleanAttendance(courseScheduleIds);
+        courseScheduleService.cleanAttendance(courseScheduleIds);
         return succeed();
     }
 }