From 5df006aac405fe996fff71f7854e37c324892367 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 09 十月 2023 18:27:48 +0800
Subject: [PATCH] 后台代码提交
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
index ce1da41..4da42ab 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java
+++ b/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());
--
Gitblit v1.7.1