From 979f60ea40cae11717644d64233797630b5e51f5 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期二, 28 十一月 2023 16:08:58 +0800 Subject: [PATCH] 11.27,8 --- cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 46 +++++++++++++--------------------------------- 1 files changed, 13 insertions(+), 33 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java index 2288be4..2b93f2c 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java +++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java @@ -63,10 +63,20 @@ int count1 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 1)); int count2 = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().eq("coursePackageSchedulingId", id).eq("reservationStatus", 0)); + CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(id); - map.put("registered", count2); - map.put("actualArrival", count1); - map.put("nonArrival", count - count1); + List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingMapper.selectList(new QueryWrapper<CoursePackageScheduling>().eq("classDate", coursePackageScheduling.getClassDate()).eq("coursePackageId", coursePackageScheduling.getCoursePackageId())); + List<Long> scs = new ArrayList<>(); + for (CoursePackageScheduling packageScheduling : coursePackageSchedulings) { + scs.add(packageScheduling.getId()); + } + int res = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 2)); + int act = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 1)); + int nonArrival = coursePackageStudentService.count(new QueryWrapper<CoursePackageStudent>().in("coursePackageSchedulingId", scs).eq("signInOrNot", 0)); + + map.put("registered", res); + map.put("actualArrival", act); + map.put("nonArrival",nonArrival); // Integer totalClassHours = (Integer) map.get("totalClassHours"); // Integer laveClassHours = (Integer) map.get("laveClassHours"); // map.put("already",totalClassHours-laveClassHours); @@ -79,36 +89,6 @@ - - /** - * 定时修改状态 - */ - @Override - public void cancel() { - new Thread(new Runnable() { - @Override - public void run() { - List<TCoursePackagePayment> list = packagePaymentService.list(); - Date now = new Date(); - List<Long> pays = new ArrayList<>(); - for (TCoursePackagePayment coursePackagePayment : list) { - if (now.before(coursePackagePayment.getUseTime())) { - pays.add(coursePackagePayment.getId()); - } - } - - List<CoursePackageStudent> coursePackagePaymentId = coursePackageStudentService.list(new QueryWrapper<CoursePackageStudent>().in("coursePackagePaymentId", pays)); - List<Long> scs = new ArrayList<>(); - for (CoursePackageStudent coursePackageStudent : coursePackagePaymentId) { - scs.add(coursePackageStudent.getCoursePackageSchedulingId()); - } - coursePackageStudentService.remove(new QueryWrapper<CoursePackageStudent>().in("coursePackagePaymentId", pays)); - coursePackageSchedulingMapper.delete(new QueryWrapper<CoursePackageScheduling>().in("id", scs)); - - - } - }).start(); - } /** * 定时修改状态 -- Gitblit v1.7.1