From 2b4511ca363e74343e1cb678c23a9e7638800a3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:33:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseRecordController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 4f0f11f..237d8e6 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
@@ -5,6 +5,7 @@
import com.dsh.course.entity.CancelledClasses;
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.CoursePackageStudentService;
import com.dsh.course.service.TCoursePackageService;
@@ -33,14 +34,14 @@
@PostMapping("/base/courseRecord/queryDeduClassHours")
- public Integer getDeductionClassHour(@RequestParam("courseId") Integer courseId,@RequestParam("stuId") Integer stuId,@RequestParam("appUserId") Integer appUserId){
+ public Integer getDeductionClassHour(@RequestBody GetStudentCourse course){
Integer sult = 0;
- TCoursePackage coursePackage = tcpService.getById(courseId);
+ TCoursePackage coursePackage = tcpService.getById(course.getCourseId());
if (null != coursePackage && coursePackage.getStatus() == 3){
- List<CoursePackageStudent> coursePackageStudents = cosService.queryStuDeduClassHourNums(courseId, stuId, appUserId);
+ List<CoursePackageStudent> coursePackageStudents = cosService.queryStuDeduClassHourNums(course.getCourseId(), course.getStuId(), course.getAppUserId());
if (coursePackageStudents.size() > 0){
List<CancelledClasses> list = caccService.list(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageId",courseId ));
+ .eq("coursePackageId",course.getCourseId() ));
if (list.size() > 0){
for (CancelledClasses cancelledClasses : list) {
sult = sult + cancelledClasses.getCancelledClassesNumber();
--
Gitblit v1.7.1