From ef96dbc9278ebae4af204cca9de98c63f0d6328e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 20 九月 2023 19:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 aebf727..854a8af 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
@@ -484,6 +484,7 @@
TCoursePackage coursePackage = this.getById(id);
CoursePackageInfo coursePackageInfo = new CoursePackageInfo();
coursePackageInfo.setId(id);
+ coursePackageInfo.setTime(coursePackage.getStartTime()+"-"+coursePackage.getEndTime());
coursePackageInfo.setCoverDrawing(coursePackage.getCoverDrawing());
coursePackageInfo.setName(coursePackage.getName());
Store store = storeClient.queryStoreById(coursePackage.getStoreId());
@@ -1032,7 +1033,7 @@
for (int i1 = 0; i1 < split.length; i1++) {
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
- coursePackageScheduling.setCourseId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
try {
Date parse = format1.parse(format.format(time) + " " + split[i1]);
Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
@@ -1064,7 +1065,7 @@
for (int i1 = 0; i1 < split.length; i1++) {
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
- coursePackageScheduling.setCourseId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
try {
Date parse = format1.parse(format.format(time) + " " + split[i1]);
Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
@@ -1094,13 +1095,17 @@
for (int i1 = 0; i1 < split.length; i1++) {
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
- coursePackageScheduling.setCourseId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
try {
Date parse = format1.parse(format.format(time) + " " + split[i1]);
Date parse1 = format1.parse(format.format(time) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
coursePackageScheduling.setEndDate(parse1);
coursePackageScheduling.setStatus(1);
+ coursePackageScheduling.setCourseId(tCoursePackage.getId());
+ coursePackageScheduling.setIntegral(0);
+ coursePackageScheduling.setCancelClasses("");
+ coursePackageScheduling.setDeductClassHour(0);
coursePackageSchedulingService.save(coursePackageScheduling);
CoursePackageStudent student1 = new CoursePackageStudent();
--
Gitblit v1.7.1