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/TCoursePackageServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
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 899fbcf..749a552 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
@@ -1339,7 +1339,7 @@
int week_of_month1 = calendar2.get(Calendar.WEEK_OF_MONTH);
//最后一次的排课时间不在本周，且是一周的最后一天。（如果是本周则表明已经课时用完了）
- if(week.get(week.size() - 1).equals(day_week1) && week_of_month == week_of_month1){
+ if(week.get(week.size() - 1).equals(day_week1) && week_of_month != week_of_month1){
return;
}
}
@@ -1530,8 +1530,6 @@
Integer codeTime = coursePackage.getCodeTime();
String classStartTime = coursePackage.getClassStartTime();
String classEndTime = coursePackage.getClassEndTime();
- String format = sdf1.format(one.getClassDate());
- String time = format.substring(format.indexOf(" ") + 1);
String[] split = classStartTime.split(",");
String[] split1 = classEndTime.split(",");
@@ -1542,6 +1540,8 @@
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
}else{
+ String format = sdf1.format(one.getClassDate());
+ String time = format.substring(format.indexOf(" ") + 1);
int n = Arrays.asList(split).indexOf(time);
if(n != split.length - 1){
calendar.setTime(one.getClassDate());
@@ -1637,8 +1637,8 @@
packageScheduling.setStudentId(coursePackageOrderStudent.getStudentId());
packageScheduling.setCoursePackageId(coursePackage.getId());
try {
- Date parse = sdf.parse(sdf1.format(time1) + " " + split[j]);
- Date parse1 = sdf.parse(sdf1.format(time1) + " " + split1[j]);
+ Date parse = sdf1.parse(sdf.format(time1) + " " + split[j]);
+ Date parse1 = sdf1.parse(sdf.format(time1) + " " + split1[j]);
packageScheduling.setClassDate(parse);
packageScheduling.setEndDate(parse1);
}catch (Exception e){
--
Gitblit v1.7.1