diff --git a/src/main/java/com/peanut/modules/common/controller/ClassController.java b/src/main/java/com/peanut/modules/common/controller/ClassController.java index 27200a00..8fea9e62 100644 --- a/src/main/java/com/peanut/modules/common/controller/ClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/ClassController.java @@ -469,9 +469,11 @@ public class ClassController { if ("ZK".equals(type)){ CourseEntity courseEntity = courseService.getById(userCertificate.getCourseId()); String courseTitle = userCertificate.getTitle(); - ClassExamUser classExamUser = classExamUserService.getOne(new LambdaQueryWrapper() - .eq(ClassExamUser::getUserId,ShiroUtils.getUId()) - .eq(ClassExamUser::getRelationId,userCertificate.getCourseId())); +// ClassExamUser classExamUser = classExamUserService.getOne(new LambdaQueryWrapper() +// .eq(ClassExamUser::getUserId,ShiroUtils.getUId()) +// .eq(ClassExamUser::getRelationId,userCertificate.getCourseId())); + + ClassExamUser classExamUser = classExamUserService.getUserHighExam(ShiroUtils.getUId()); String endYear = DateUtil.year(classExamUser.getEndTime())+""; String endMonth = DateUtil.month(classExamUser.getEndTime())+1+""; String endDay = DateUtil.dayOfMonth(classExamUser.getEndTime())+""; diff --git a/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java b/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java index dc338fe4..0b3ce65a 100644 --- a/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java +++ b/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java @@ -4,4 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.modules.common.entity.ClassExamUser; public interface ClassExamUserService extends IService { + + ClassExamUser getUserHighExam(int uid); } diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java index a18aa917..04949618 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassExamUserServiceImpl.java @@ -1,5 +1,6 @@ package com.peanut.modules.common.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.peanut.modules.common.dao.ClassExamUserDao; import com.peanut.modules.common.entity.ClassExamUser; @@ -7,7 +8,17 @@ import com.peanut.modules.common.service.ClassExamUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import java.util.List; + @Slf4j @Service("commonClassExamUserService") public class ClassExamUserServiceImpl extends ServiceImpl implements ClassExamUserService { + @Override + public ClassExamUser getUserHighExam(int uid) { + LambdaQueryWrapper classExamUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + classExamUserLambdaQueryWrapper.eq(ClassExamUser::getUserId,uid); + classExamUserLambdaQueryWrapper.orderByAsc(ClassExamUser::getScore); + List classExamUsers = this.getBaseMapper().selectList(classExamUserLambdaQueryWrapper); + return classExamUsers.size()>0?classExamUsers.get(0):null; + } }