From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
index ad47688..ed9a9e5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
@@ -1,16 +1,21 @@
package com.dsh.course.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.course.entity.CoursePackageScheduling;
import com.dsh.course.entity.CoursePackageStudent;
import com.dsh.course.entity.StudentClassInfo;
+import com.dsh.course.entity.TAppUser;
import com.dsh.course.entity.dto.ClassListDto;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.StudentClient;
import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Student;
+import com.dsh.course.mapper.CoursePackageSchedulingMapper;
import com.dsh.course.mapper.CoursePackageStudentMapper;
import com.dsh.course.model.QueryCoursePackageStudentList;
+import com.dsh.course.service.CoursePackageSchedulingService;
import com.dsh.course.service.CoursePackageStudentService;
import com.dsh.course.util.ToolUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +23,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -42,7 +48,8 @@
-
+ @Autowired
+ private CoursePackageSchedulingMapper coursePackageSchedulingService;
/**
* 获取排课预约数据
@@ -65,13 +72,24 @@
studentId = students.stream().map(Student::getId).collect(Collectors.toList());
}
}
- List<Map<String, Object>> list = this.baseMapper.queryCoursePackageStudentList(page, queryCoursePackageStudentList.getCoursePackageSchedulingId(), userId, studentId);
+
+
+ CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingService.selectById(queryCoursePackageStudentList.getCoursePackageSchedulingId());
+ List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.selectList(new QueryWrapper<CoursePackageScheduling>().eq("coursePackageId", coursePackageScheduling.getCoursePackageId()).eq("classDate", coursePackageScheduling.getClassDate()));
+
+
+ List<Long> ids = new ArrayList<>();
+ for (CoursePackageScheduling packageScheduling : coursePackageSchedulings) {
+ ids.add(packageScheduling.getId());
+ }
+
+ List<Map<String, Object>> list = this.baseMapper.queryCoursePackageStudentList(page, ids, userId, studentId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
Integer now = Integer.valueOf(sdf.format(new Date()));
for (Map<String, Object> map : list) {
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer student_Id = Integer.valueOf(map.get("studentId").toString());
- AppUser appUser = appUserClient.queryAppUser(appUserId);
+ TAppUser appUser = appUserClient.queryAppUser1(appUserId);
Student student = studentClient.queryStudentById(student_Id);
map.put("userName", appUser.getName());
map.put("phone", student.getPhone());
--
Gitblit v1.7.1