From 852681bc9257e9eaae64d027a9bc6d88f93f35b4 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 23 九月 2023 09:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 717e7c5..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
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.alibaba.nacos.common.utils.UuidUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -27,11 +26,8 @@
import com.dsh.course.model.*;
import com.dsh.course.service.*;
import com.dsh.course.util.*;
-import com.dsh.course.util.httpClinet.HttpResult;
-import org.omg.CORBA.INTERNAL;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -488,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());
@@ -1036,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]);
@@ -1068,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]);
@@ -1098,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