44323
2023-09-26 6676f28a5a6ca65015a2b2c26e804fa998d625c8
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
@@ -54,8 +54,8 @@
    @ResponseBody
    @PostMapping("/cancelledClasses/listAll")
    public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query){
        List<CancelClassesVO> res = new ArrayList<>();
        if (query.getStudentName()!=null){
        if (!query.getStudentName().equals("")){
            List<Integer> s = new ArrayList<>();
            List<Student> students = studentClient.queryStudentListByName(query.getStudentName());
@@ -67,6 +67,8 @@
            }
            query.setStudentIds(s);
        }
        }
        if (query.getCoachName()!=null){
        if (!query.getCoachName().equals("")){
            List<Integer> c = new ArrayList<>();
            List<Coach> coaches = coachClient.queryCoachListByName(query.getCoachName());
@@ -78,6 +80,8 @@
            }
            query.setCoachIds(c);
        }
        }
        List<CancelClassesVO> result = cancelledClassesService.listAll(query);
        for (CancelClassesVO cancelClassesVO : result) {
            CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());