From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CancelledClassesController.java | 66 +++++++++++++++++++++++----------
1 files changed, 46 insertions(+), 20 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..e8bae42 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
@@ -1,7 +1,9 @@
package com.dsh.course.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dsh.course.entity.CancelledClasses;
import com.dsh.course.entity.CoursePackageScheduling;
+import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.CoachClient;
@@ -22,6 +24,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhibing.pu
@@ -54,33 +57,56 @@
@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);
+ List<Integer> collect =new ArrayList<>();
+ if(query.getStoreId()!=null){
+ List<TCoursePackage> list = coursePackageService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, query.getStoreId()));
+ collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ }
+ if(query.getStoreIds()!=null && query.getStoreIds().size()!=0){
+ List<TCoursePackage> list = coursePackageService
+ .list(new LambdaQueryWrapper<TCoursePackage>()
+ .in(TCoursePackage::getStoreId, query.getStoreIds()));
+ collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ }
+ List<CancelClassesVO> result = cancelledClassesService.listAll(query,collect);
for (CancelClassesVO cancelClassesVO : result) {
CoursePackageScheduling byId1 = coursePackageSchedulingService.getById(cancelClassesVO.getCoursePackageSchedulingId());
+ if (byId1==null){
+ continue;
+ }
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String string = format.format(byId1.getClassDate());
String string1 = format.format(byId1.getEndDate());
--
Gitblit v1.7.1