This commit is contained in:
Lx 2025-05-10 17:50:44 +08:00
parent ad1015fe88
commit faa12a4329

View File

@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.base.service.DlDriveSchoolStudentService;
import cn.iocoder.yudao.module.course.entity.Process; import cn.iocoder.yudao.module.course.entity.Process;
import cn.iocoder.yudao.module.course.entity.SchoolCourseOrder; import cn.iocoder.yudao.module.course.entity.SchoolCourseOrder;
import cn.iocoder.yudao.module.course.service.ProcessService; import cn.iocoder.yudao.module.course.service.ProcessService;
import cn.iocoder.yudao.module.course.service.SchoolCourseOrderService;
import cn.iocoder.yudao.module.course.vo.ProcessVO; import cn.iocoder.yudao.module.course.vo.ProcessVO;
import cn.iocoder.yudao.module.exam.entity.ExamBatch; import cn.iocoder.yudao.module.exam.entity.ExamBatch;
import cn.iocoder.yudao.module.exam.entity.ExamBatchItem; import cn.iocoder.yudao.module.exam.entity.ExamBatchItem;
@ -23,7 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.Arrays;
@Service @Service
public class StudentScoreInputServiceImpl implements StudentScoreInputService { public class StudentScoreInputServiceImpl implements StudentScoreInputService {
@ -45,6 +47,9 @@ public class StudentScoreInputServiceImpl implements StudentScoreInputService {
@Autowired @Autowired
private StudentScoreInputMapper studentScoreInputMapper; private StudentScoreInputMapper studentScoreInputMapper;
@Autowired
private SchoolCourseOrderService schoolCourseOrderService;
/** /**
* 录入学员成绩 * 录入学员成绩
*/ */
@ -94,6 +99,27 @@ public class StudentScoreInputServiceImpl implements StudentScoreInputService {
// 更新批次通过率 // 更新批次通过率
examBatchItemServiceImpl.updateBatchPassRate(examBatch.getId()); examBatchItemServiceImpl.updateBatchPassRate(examBatch.getId());
} }
/*if(studentScoreInput.getSubject() == 4 && "1".equals(studentScoreInput.getExamStatus())){
// 修改订单表的拿证时间
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getPassTime, studentScoreInput.getExamTime()));
}
if(studentScoreInput.getSubject() == 3 && "1".equals(studentScoreInput.getExamStatus())){
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getGradTime, studentScoreInput.getExamTime()));
}*/
// 修改下一课程状态 // 修改下一课程状态
this.updateNextSubjectStatus(studentScoreInput); this.updateNextSubjectStatus(studentScoreInput);
} }
@ -107,7 +133,7 @@ public class StudentScoreInputServiceImpl implements StudentScoreInputService {
if(studentScoreInput.getExamStatus().equals("1")){ if(studentScoreInput.getExamStatus().equals("1")){
if(process.getSubject() == 4){ if(process.getSubject() == 4){
dlDriveSchoolStudentService.adminUpdateStudentPassAndGradTime(studentScoreInput.getExamTime(), null, studentScoreInput.getUserId(), studentScoreInput.getCourseId(), studentScoreInput.getTenantId()); /*dlDriveSchoolStudentService.adminUpdateStudentPassAndGradTime(studentScoreInput.getExamTime(), null, studentScoreInput.getUserId(), studentScoreInput.getCourseId(), studentScoreInput.getTenantId());*/
} else if (process.getSubject() == 3) { } else if (process.getSubject() == 3) {
processService.update(Wrappers.lambdaUpdate(Process.class) processService.update(Wrappers.lambdaUpdate(Process.class)
.eq(Process::getCourseId, studentScoreInput.getCourseId()) .eq(Process::getCourseId, studentScoreInput.getCourseId())
@ -115,7 +141,7 @@ public class StudentScoreInputServiceImpl implements StudentScoreInputService {
.eq(Process::getCoachId, studentScoreInput.getCoachId()) .eq(Process::getCoachId, studentScoreInput.getCoachId())
.eq(Process::getSubject, 4) .eq(Process::getSubject, 4)
.set(Process::getStatus, 1)); .set(Process::getStatus, 1));
dlDriveSchoolStudentService.adminUpdateStudentPassAndGradTime(null,studentScoreInput.getExamTime(), studentScoreInput.getUserId(), studentScoreInput.getCourseId(), studentScoreInput.getTenantId()); /*dlDriveSchoolStudentService.adminUpdateStudentPassAndGradTime(null,studentScoreInput.getExamTime(), studentScoreInput.getUserId(), studentScoreInput.getCourseId(), studentScoreInput.getTenantId());*/
} else if (process.getSubject() == 2) { } else if (process.getSubject() == 2) {
processService.update(Wrappers.lambdaUpdate(Process.class) processService.update(Wrappers.lambdaUpdate(Process.class)
.eq(Process::getCourseId, studentScoreInput.getCourseId()) .eq(Process::getCourseId, studentScoreInput.getCourseId())
@ -171,6 +197,44 @@ public class StudentScoreInputServiceImpl implements StudentScoreInputService {
examBatchItemServiceImpl.updateBatchPassRateNew(examBatchItemNewVOS.getBatchId()); examBatchItemServiceImpl.updateBatchPassRateNew(examBatchItemNewVOS.getBatchId());
} }
} }
if(studentScoreInput.getSubject() == 4 && "1".equals(studentScoreInput.getExamStatus())){
// 如果是科目四需要修改订单表的拿证时间
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getPassTime, studentScoreInput.getExamTime()));
} else if (studentScoreInput.getSubject() == 4 && "0".equals(studentScoreInput.getExamStatus())) {
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getPassTime, null));
} else if (studentScoreInput.getSubject() == 3 && "1".equals(studentScoreInput.getExamStatus())) {
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getGradTime, studentScoreInput.getExamTime()));
} else if (studentScoreInput.getSubject() == 3 && "0".equals(studentScoreInput.getExamStatus())) {
schoolCourseOrderService.update(Wrappers.lambdaUpdate(SchoolCourseOrder.class)
.eq(SchoolCourseOrder::getCourseId, studentScoreInput.getCourseId())
.eq(SchoolCourseOrder::getUserId, studentScoreInput.getUserId())
.eq(SchoolCourseOrder::getCoachUserId, studentScoreInput.getCoachId())
.in(SchoolCourseOrder::getPaymentStatus, Arrays.asList("2", "3", "4"))
.eq(SchoolCourseOrder::getIfEnd, false)
.eq(SchoolCourseOrder::getIfAssignmentCoach, true)
.set(SchoolCourseOrder::getGradTime, null));
}
} }