From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +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/controller/CourseRecordController.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 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 863e0e0..bb2888b 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
@@ -41,22 +41,21 @@
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));
+ .eq("signInOrNot", 1));
- if (coursePackageStudents.size() > 0){
+ 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();
}
@@ -76,16 +75,16 @@
@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);
@@ -96,9 +95,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