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 | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 fe4934d..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);
@@ -289,7 +299,7 @@
* @param coursePackageOrderStudentId
*/
@Override
- public void addNewCoursePackageScheduling(Integer coursePackageOrderStudentId, Integer classNumber) {
+ public void addNewCoursePackageScheduling(Long coursePackageOrderStudentId, Integer classNumber) {
CoursePackageOrderStudent coursePackageOrderStudent = coursePackageOrderStudentService.getById(coursePackageOrderStudentId);
CoursePackageScheduling coursePackageScheduling = this.getOne(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", coursePackageOrderStudent.getAppUserId())
--
Gitblit v1.7.1