From fefe82cb5376e5cc25d6de7f5a733a1551f7c164 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 11 Jul 2025 11:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AF=81=E4=B9=A6=E6=97=B6?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=88=A4=E6=96=AD=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/controller/ClassController.java | 12 +++++------- .../modules/common/service/ClassExamUserService.java | 2 +- .../service/impl/ClassExamUserServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 9 deletions(-) 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 5fda8d3a..5b5b1f46 100644 --- a/src/main/java/com/peanut/modules/common/controller/ClassController.java +++ b/src/main/java/com/peanut/modules/common/controller/ClassController.java @@ -46,6 +46,8 @@ public class ClassController { private SysNoticeService sysNoticeService; @Autowired private ClassTaskService classTaskService; + @Autowired + private MyUserService userService; //班级模型列表 @RequestMapping("/getClassModelList") @@ -568,19 +570,15 @@ public class ClassController { //生成证书图片 @RequestMapping("/generateCertificateClass") public R generateCertificateClass(@RequestBody Map params) { - MyUserEntity user = ShiroUtils.getUser(); + UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString()); + MyUserEntity user = userService.getById(userCertificate.getUserId()); String photoUrl = user.getPhoto();//证书人照片 String realName = user.getName();//真实姓名 - UserCertificate userCertificate = userCertificateService.getById(params.get("id").toString()); String type = userCertificate.getType();//证书类型A a证 B b证 ZK自考 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.getUserHighExam(ShiroUtils.getUId()); + ClassExamUser classExamUser = classExamUserService.getUserHighExam(user.getId(),courseEntity.getId()); 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 0b3ce65a..2e46b902 100644 --- a/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java +++ b/src/main/java/com/peanut/modules/common/service/ClassExamUserService.java @@ -5,5 +5,5 @@ import com.peanut.modules.common.entity.ClassExamUser; public interface ClassExamUserService extends IService { - ClassExamUser getUserHighExam(int uid); + ClassExamUser getUserHighExam(int uid,int courseId); } 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 04949618..a061c085 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 @@ -14,9 +14,10 @@ import java.util.List; @Service("commonClassExamUserService") public class ClassExamUserServiceImpl extends ServiceImpl implements ClassExamUserService { @Override - public ClassExamUser getUserHighExam(int uid) { + public ClassExamUser getUserHighExam(int uid,int courseId) { LambdaQueryWrapper classExamUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); classExamUserLambdaQueryWrapper.eq(ClassExamUser::getUserId,uid); + classExamUserLambdaQueryWrapper.eq(ClassExamUser::getRelationId,courseId); classExamUserLambdaQueryWrapper.orderByAsc(ClassExamUser::getScore); List classExamUsers = this.getBaseMapper().selectList(classExamUserLambdaQueryWrapper); return classExamUsers.size()>0?classExamUsers.get(0):null;