From ee3117fc2765175cd0fc474243563442d3156511 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 28 十一月 2023 20:43:04 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 11 +++++++----
1 files changed, 7 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 17df637..0c95cb3 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
@@ -172,6 +172,8 @@
.orderByDesc("classDate")
.last(" limit 0, 1")
);
+ Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
+ Date validity = student.getValidity();
TCoursePackage coursePackage = coursePackageService.getById(coursePackageScheduling.getCoursePackageId());
//上课星期
String classWeeks = coursePackage.getClassWeeks();
@@ -221,7 +223,7 @@
continue;
}
//大于有效期不进行排课
- if (start.getTimeInMillis() >= useTime.getTime()) {
+ if (start.getTimeInMillis() >= validity.getTime()) {
break;
}
for (int j = 0; j < split.length; j++) {
@@ -318,6 +320,8 @@
TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());
Integer codeTime = coursePackage.getCodeTime();
Integer laveClassHours = coursePackageOrderStudent.getLaveClassHours();
+ Student student = studentClient.queryStudentById(coursePackageScheduling.getStudentId());
+ Date validity = student.getValidity();
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
@@ -370,7 +374,7 @@
}
//大于有效期不进行排课
- if (startTime.getTimeInMillis() >= useTime.getTime()) {
+ if (startTime.getTimeInMillis() >= validity.getTime()) {
break;
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -484,7 +488,7 @@
}
//大于有效期不进行排课
- if (startTime.getTimeInMillis() >= useTime.getTime()) {
+ if (startTime.getTimeInMillis() >= validity.getTime()) {
break;
}
for (int j = 0; j < split.length; j++) {
@@ -529,7 +533,6 @@
coursePackageOrderStudent.setUseTime(useTime);
coursePackageOrderStudent.setStatus(1);
coursePackageOrderStudentService.updateById(coursePackageOrderStudent);
- Student student = studentClient.queryStudentById(coursePackageOrderStudent.getStudentId());
if(null == student.getValidity()){
student.setValidity(useTime);
}else if(student.getValidity().getTime() < useTime.getTime()){
--
Gitblit v1.7.1