Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-07 0be58dbf7774fef98ddac83c3f454b49c6d5a6c1

 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;
@@ -32,15 +33,20 @@



    @PostMapping("/courseRecord/queryDeduClassHours")
    public Integer getDeductionClassHour(@RequestBody Integer courseId,@RequestBody Integer stuId,@RequestBody Integer appUserId){
    @PostMapping("/base/courseRecord/queryDeduClassHours")
    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.list(new QueryWrapper<CoursePackageStudent>()
                    .eq("coursePackageId",course.getCourseId() )
                    .eq("studentId",course.getStuId() )
                    .eq("appUserId", course.getAppUserId())
                    .eq("signInOrNot",1));

            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();