From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
index db47c6d..c8d81b5 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.entity.CancelledClasses;
+import com.dsh.course.entity.CourseCounsum;
import com.dsh.course.entity.CoursePackageStudent;
import com.dsh.course.entity.TCoursePackage;
import com.dsh.course.feignclient.model.GetStudentCourse;
import com.dsh.course.service.CancelledClassesService;
+import com.dsh.course.service.CourseCounsumService;
import com.dsh.course.service.CoursePackageStudentService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.ToolUtil;
@@ -39,22 +41,20 @@
private CancelledClassesService caccService;
-
@PostMapping("/base/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestBody GetStudentCourse course){
+ public Integer getDeductionClassHour(@RequestBody GetStudentCourse course) {
Integer sult = 0;
TCoursePackage coursePackage = tcpService.getById(course.getCourseId());
- if (null != coursePackage && coursePackage.getStatus() == 3){
+ if (null != coursePackage && coursePackage.getStatus() == 3) {
List<CoursePackageStudent> coursePackageStudents = cosService.list(new QueryWrapper<CoursePackageStudent>()
- .eq("coursePackageId",course.getCourseId() )
- .eq("studentId",course.getStuId() )
+ .eq("coursePackageId", course.getCourseId())
+ .eq("studentId", course.getStuId())
.eq("appUserId", course.getAppUserId())
- .eq("signInOrNot",1));
-
- if (coursePackageStudents.size() > 0){
+ .eq("signInOrNot", 1));
+ if (coursePackageStudents.size() > 0) {
List<CancelledClasses> list = caccService.list(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageId",course.getCourseId() ));
- if (list.size() > 0){
+ .eq("coursePackageId", course.getCourseId()));
+ if (list.size() > 0) {
for (CancelledClasses cancelledClasses : list) {
sult = sult + cancelledClasses.getCancelledClassesNumber();
}
@@ -63,19 +63,24 @@
}
return sult;
}
+ @Autowired
+ private CourseCounsumService courseCounsumService;
+ @PostMapping("/base/courseRecord/save")
+ public void save(@RequestBody CourseCounsum courseCounsum) {
+ courseCounsumService.save(courseCounsum);
+ }
@PostMapping("/base/courseRecord/cancelCourseData")
- public Integer cancelCourseRecordClass(@RequestBody Integer courseRecordId){
+ public Integer cancelCourseRecordClass(@RequestBody Integer courseRecordId) {
int sult = 0;
CoursePackageStudent packageStudent = cosService.getById(courseRecordId);
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy.MM.dd");
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
String tis = simpleDateFormat.format(new Date());
-
- if (ToolUtil.isNotEmpty(packageStudent)){
+ if (ToolUtil.isNotEmpty(packageStudent)) {
TCoursePackage coursePackage = tcpService.getById(packageStudent.getCoursePackageId());
- String startTime = tis +" " + coursePackage.getClassStartTime();
+ String startTime = tis + " " + coursePackage.getClassStartTime();
Date parse = null;
try {
parse = format.parse(startTime);
@@ -86,9 +91,9 @@
// 计算时间间隔
long hours = ChronoUnit.HOURS.between(LocalDateTime.now(), localDateTime);
// 判断是否在前三小时内
- if (hours <= 3 && hours >= 0){
+ if (hours <= 3 && hours >= 0) {
sult = 1;
- }else {
+ } else {
sult = 2;
}
}
--
Gitblit v1.7.1