From 1d07f8271751880bdfbf3ea41e696f9ee719888b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 17 八月 2023 08:48:36 +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 | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 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 7d1f58c..c420f00 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,10 +1,25 @@
package com.dsh.course.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.entity.CoursePackageStudent;
+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.CoursePackageStudentMapper;
+import com.dsh.course.model.QueryCoursePackageStudentList;
import com.dsh.course.service.CoursePackageStudentService;
+import com.dsh.course.util.ToolUtil;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* <p>
@@ -17,5 +32,51 @@
@Service
public class CoursePackageStudentServiceImpl extends ServiceImpl<CoursePackageStudentMapper, CoursePackageStudent> implements CoursePackageStudentService {
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private StudentClient studentClient;
+
+
+
+
+
+ /**
+ * 获取排课预约数据
+ * @param queryCoursePackageStudentList
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, QueryCoursePackageStudentList queryCoursePackageStudentList) {
+ List<Integer> userId = null;
+ List<Integer> studentId = null;
+ if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())){
+ List<AppUser> appUsers = appUserClient.queryAppUserListByName(queryCoursePackageStudentList.getUserName());
+ if(appUsers.size() > 0){
+ userId = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
+ }
+ }
+ if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())){
+ List<Student> students = studentClient.queryStudentListByName(queryCoursePackageStudentList.getStudentName());
+ if(students.size() > 0){
+ studentId = students.stream().map(Student::getId).collect(Collectors.toList());
+ }
+ }
+ List<Map<String, Object>> list = this.baseMapper.queryCoursePackageStudentList(page, queryCoursePackageStudentList.getCoursePackageSchedulingId(), 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);
+ Student student = studentClient.queryStudentById(student_Id);
+ map.put("userName", appUser.getName());
+ map.put("phone", student.getPhone());
+ map.put("studentName", student.getName());
+ map.put("age", null != student.getBirthday() ? now - Integer.valueOf(sdf.format(student.getBirthday())) : "-");
+ map.put("sex", student.getSex());
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1