更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

 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;
@@ -41,11 +47,12 @@
    private StudentClient studentClient;




    @Autowired
    private CoursePackageSchedulingMapper coursePackageSchedulingService;

    /**
     * 获取排课预约数据
     *
     * @param queryCoursePackageStudentList
     * @return
     */
@@ -53,31 +60,47 @@
    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())){
        if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getUserName())) {
            List<AppUser> appUsers = appUserClient.queryAppUserListByName(queryCoursePackageStudentList.getUserName());
            if(appUsers.size() > 0){
            if (appUsers.size() > 0) {
                userId = appUsers.stream().map(AppUser::getId).collect(Collectors.toList());
            }
        }
        if(ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())){
        if (ToolUtil.isNotEmpty(queryCoursePackageStudentList.getStudentName())) {
            List<Student> students = studentClient.queryStudentListByName(queryCoursePackageStudentList.getStudentName());
            if(students.size() > 0){
            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);


        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);
            if(null != appUser){
                map.put("userName", appUser.getName());
                map.put("phone", appUser.getPhone());
            }
            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());
            if(null != student){
                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;
    }
@@ -89,7 +112,11 @@

    @Override
    public List<ClassListDto> getClassList(Integer tStudentId) {
        return this.baseMapper.getClassList(tStudentId);
        List<ClassListDto> classList = this.baseMapper.getClassList(tStudentId);
        List<ClassListDto> holiList = this.baseMapper.getHoliList(tStudentId);
        classList.addAll(holiList);

        return classList;
    }

    @Override
@@ -101,4 +128,9 @@
    public Date getMinDate(Integer tStudentId) {
        return null;
    }

    @Override
    public void updateSignInOrNotById(Long id) {
        this.baseMapper.updateSignInOrNotById(id);
    }
}