10.10

nickchange

2023-10-10 ee9cb0da4a43bcf523ebb157678f64a2895fba1a

 cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java

@@ -54,30 +54,34 @@
    @ResponseBody
    @PostMapping("/cancelledClasses/listAll")
    public List<CancelClassesVO> listAll(@RequestBody CancelClassesQuery query){

        List<CancelClassesVO> res = new ArrayList<>();
        if (!query.getStudentName().equals("")){
            List<Integer> s = new ArrayList<>();
            List<Student> students = studentClient.queryStudentListByName(query.getStudentName());
            if (students.size()==0){
                return new ArrayList<>();
        if (query.getStudentName()!=null){
            if (!query.getStudentName().equals("")){
                List<Integer> s = new ArrayList<>();
                List<Student> students = studentClient.queryStudentListByName(query.getStudentName());
                if (students.size()==0){
                    return new ArrayList<>();
                }
                for (Student coach : students) {
                    s.add(coach.getId());
                }
                query.setStudentIds(s);
            }
            for (Student coach : students) {
                s.add(coach.getId());
            }
            query.setStudentIds(s);
        }
        if (!query.getCoachName().equals("")){
            List<Integer> c = new ArrayList<>();
            List<Coach> coaches = coachClient.queryCoachListByName(query.getCoachName());
            if (coaches.size()==0){
                return new ArrayList<>();
        if (query.getCoachName()!=null){
            if (!query.getCoachName().equals("")){
                List<Integer> c = new ArrayList<>();
                List<Coach> coaches = coachClient.queryCoachListByName(query.getCoachName());
                if (coaches.size()==0){
                    return new ArrayList<>();
                }
                for (Coach coach : coaches) {
                    c.add(coach.getId());
                }
                query.setCoachIds(c);
            }
            for (Coach coach : coaches) {
                c.add(coach.getId());
            }
            query.setCoachIds(c);
        }

        List<CancelClassesVO> result = cancelledClassesService.listAll(query);
        for (CancelClassesVO cancelClassesVO : result) {
            CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());