From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageOrderStudentServiceImpl.java | 63 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 19 deletions(-)
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 3b2c382..6acdef8 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
@@ -134,42 +134,67 @@
String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
// if (integerList.contains(weekOfDate)) {
String dat = simpleDateFormat.format(byId.getClassDate()) + " " + dateString1.substring(11);
+ String ed = simpleDateFormat.format(byId.getEndDate()) + " " + dateString2.substring(11);
Date start = null;
+ Date end = null;
try {
start = format.parse(dat);
+ end = format.parse(ed);
} catch (ParseException e) {
throw new RuntimeException(e);
}
+
+ CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
+ .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
+// else {
+// Date now = new Date();
+// if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
+// recordVo.setStatus(2);
+// } else {
+// recordVo.setStatus(3);
+//
+// }
+// }
+
//已取消
if (byId.getStatus() == 4) {
recordVo.setStatus(4);
} else if (coursePackageStudent.getSignInOrNot() == 2) {
//已请假
recordVo.setStatus(5);
- } else if (start.after(new Date())) {
+ }else if (ToolUtil.isNotEmpty(cancelledClasses)) {
+ recordVo.setStatus(3);
+ // 消课 到课状态0 旷课
+ if (coursePackageStudent.getSignInOrNot() == 0) {
+ recordVo.setStatus(6);
+ }
+
+ }else if (new Date().after(start)&&new Date().before(end)){
+ recordVo.setStatus(2);
+ }else if (start.after(new Date())) {
//待上课
recordVo.setStatus(1);
}
else {
- CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
- if (ToolUtil.isNotEmpty(cancelledClasses)) {
- recordVo.setStatus(3);
- // 消课 到课状态0 旷课
- if (coursePackageStudent.getSignInOrNot() == 0) {
- recordVo.setStatus(6);
- }
-
- } else {
- Date now = new Date();
- if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
- recordVo.setStatus(2);
- } else {
- recordVo.setStatus(3);
-
- }
- }
+// CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
+// .eq("coursePackageSchedulingId", byId.getId()).last("limit 1"));
+// if (ToolUtil.isNotEmpty(cancelledClasses)) {
+// recordVo.setStatus(3);
+// // 消课 到课状态0 旷课
+// if (coursePackageStudent.getSignInOrNot() == 0) {
+// recordVo.setStatus(6);
+// }
+//
+// } else {
+// Date now = new Date();
+// if (now.after(byId.getClassDate()) && now.before(byId.getEndDate())) {
+// recordVo.setStatus(2);
+// } else {
+// recordVo.setStatus(3);
+//
+// }
+// }
}
// } else {
// recordVo.setStatus(1);
--
Gitblit v1.7.1