From eb754c93037250419eceee17bfb526551e85f173 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 22:06:38 +0800
Subject: [PATCH] 修改报表
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageSchedulingServiceImpl.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 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 e24d614..61331ad 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
@@ -163,6 +163,15 @@
.gt("useTime", "now()")
.gt("laveClassHours", 0)
);
+
+ List<CoursePackageOrder> list1 = coursePackageOrderService.list(new QueryWrapper<CoursePackageOrder>()
+ .eq("payStatus", 2)
+ .eq("status", 1)
+ .eq("state", 1)
+ .gt("laveClassHours", 0)
+ .orderByAsc("insertTime")
+ );
+
for (CoursePackageOrderStudent coursePackageOrderStudent : list) {
CoursePackageScheduling coursePackageScheduling = this.getOne(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", coursePackageOrderStudent.getAppUserId())
@@ -207,9 +216,12 @@
.eq("status", 1)
.eq("type", 1)
);
- laveClassHours -= count;
-
Integer codeTime = coursePackage.getCodeTime();
+ laveClassHours -= count;
+ //剩余数量不足以排课
+ if (laveClassHours.compareTo(codeTime) < 0) {
+ break;
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
//生成一周的排课数据
for (int i = 0; i < num; i++) {
@@ -414,7 +426,12 @@
}
}else{
- Date classDate = coursePackageScheduling.getClassDate();
+ Date classDate = new Date();
+
+ if (coursePackageScheduling!=null){
+ classDate = coursePackageScheduling.getClassDate();
+ }
+
int count = this.count(new QueryWrapper<CoursePackageScheduling>()
.eq("appUserId", coursePackageOrderStudent.getAppUserId())
.eq("studentId", coursePackageOrderStudent.getStudentId())
@@ -423,10 +440,11 @@
);
Integer number = laveClassHours - count;
- if(codeTime.compareTo(number) > 0 && calendar.getTimeInMillis() > classDate.getTime()){
+ if((number.compareTo(codeTime) > 0 && calendar.getTimeInMillis() > classDate.getTime())||coursePackageScheduling==null){
//从第二天开始
Calendar startTime = Calendar.getInstance();
- startTime.setTime(coursePackageScheduling.getClassDate());
+// startTime.setTime(coursePackageScheduling.getClassDate());
+ startTime.setTime(classDate);
startTime.set(Calendar.DAY_OF_YEAR, startTime.get(Calendar.DAY_OF_YEAR) + 1);
startTime.set(Calendar.HOUR_OF_DAY, 0);
startTime.set(Calendar.MINUTE, 0);
@@ -444,8 +462,8 @@
//判断最后一天是否所有时段都已排完
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
- String format = sdf.format(coursePackageScheduling.getClassDate());
- String time = format.substring(format.indexOf(" ") + 1);
+ String format = sdf.format(classDate);
+ String time = format.substring(0,format.indexOf(" ") + 1);
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
String[] split = classStartTime.split(",");
--
Gitblit v1.7.1