From b0da58b53f3828a5ce7f0f1344a4c01c87181808 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 27 十一月 2023 19:23:39 +0800
Subject: [PATCH] 修改假期课排课bug
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 6 +++---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 2 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 9 ++++-----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index 716e55f..f469119 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -715,11 +715,11 @@
Integer totalNu = 0;
Integer dedutNu = 0;
Integer remainNu = 0;
- List<TCoursePackagePayment> byUserId = packagePaymentService.list(new QueryWrapper<TCoursePackagePayment>()
+ List<CoursePackageOrderStudent> byUserId = coursePackageOrderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>()
.eq("appUserId", getStuOfCoursesDetails.getAppUserId())
.eq("studentId", getStuOfCoursesDetails.getStuId()));
if (byUserId.size() > 0) {
- for (TCoursePackagePayment tCoursePackagePayment : byUserId) {
+ for (CoursePackageOrderStudent tCoursePackagePayment : byUserId) {
totalNu = totalNu + tCoursePackagePayment.getTotalClassHours();
dedutNu = dedutNu + tCoursePackagePayment.getLaveClassHours();
remainNu = remainNu + (tCoursePackagePayment.getTotalClassHours() - tCoursePackagePayment.getLaveClassHours());
@@ -2347,7 +2347,7 @@
}
//排课的ids
List<Long> collect2 = list3.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
- if (collect2.isEmpty()) {
+ if (collect2.isEmpty()){
collect2.add(-1l);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
index 16c5563..a6ca198 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java
@@ -69,7 +69,7 @@
List<CoursePackageScheduling> list = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", appUserId)
.eq("studentId", stuId)
- .lt("classDate", sdf.format(calendar.getTime()))
+// .lt("classDate", sdf.format(calendar.getTime()))
.orderByAsc("classDate")
);
List<Long> ids = list.stream().map(CoursePackageScheduling::getId).collect(Collectors.toList());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index a4b9b23..2e4c389 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1267,6 +1267,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
//剩余课时
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
//扣除课时数
@@ -1350,10 +1351,8 @@
Calendar calendar = Calendar.getInstance();
//假期开始使用当前时间为起始时间进行排课
calendar.setTime(startTime.getTime() > System.currentTimeMillis() ? startTime : new Date());
- int day_week = calendar.get(Calendar.DAY_OF_WEEK);
- day_week = day_week - 1 == 0 ? 7 : day_week - 1;
- int num = 8 - day_week + 7;
- for (int i = 0; i < num; i++) {
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ while (true) {
Date time = calendar.getTime();
//判断当天是否在排课星期内
@@ -1365,7 +1364,7 @@
}
//大于有效期不进行排课
- if (calendar.getTimeInMillis() >= endTime.getTime()) {
+ if (calendar.getTimeInMillis() > endTime.getTime()) {
break;
}
for (int j = 0; j < split.length; j++) {
--
Gitblit v1.7.1