From e995811e841059f310b731865b7d3d7ed5b80bbd Mon Sep 17 00:00:00 2001 From: xyc <3422692813@qq.com> Date: Thu, 17 Apr 2025 18:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/course/service/impl/ProcessServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java index 2c125ca3..7a2d6195 100644 --- a/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java +++ b/dl-module-jx/src/main/java/cn/iocoder/yudao/module/course/service/impl/ProcessServiceImpl.java @@ -83,8 +83,9 @@ public class ProcessServiceImpl extends ServiceImpl impl Long userId = SecurityFrameworkUtils.getLoginUserId(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .eq(Process::getCoachId, userId) + .notIn(Process::getSubject, Arrays.asList(1, 4)) //状态不等于2-已完成的科目 - .ne(Process::getStatus, "2") +// .ne(Process::getStatus, "2") .groupBy(Process::getCourseId).groupBy(Process::getSubject); return this.list(queryWrapper); } @@ -110,7 +111,7 @@ public class ProcessServiceImpl extends ServiceImpl impl } //状态等于1-训练中的 queryWrapper.eq(Process::getStatus, "1") - .isNull(Process::getExamStatus) + .and(wrapper -> wrapper.isNull(Process::getExamStatus).or().eq(Process::getExamStatus, "0")) .groupBy(Process::getUserId) .orderByDesc(BaseDO::getCreateTime); return this.page(page, queryWrapper); @@ -367,7 +368,7 @@ public class ProcessServiceImpl extends ServiceImpl impl // 发送消息给教练 String message = String.format(SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TEMPLATE_MEMBER_EXAM_SCORE, process.getUserName(), "科目一", process.getExamScore(), "已通过"); schoolNotifyMessageSendService.sendMessage(process.getCoachId(), message, SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TYPE_ADMIN, process.getTenantId()); - }else if(process.getExamStatus() != null && !process.getExamStatus().equals("0")){ + } else if (process.getExamStatus() != null && !process.getExamStatus().equals("0")) { String message = String.format(SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TEMPLATE_MEMBER_EXAM_SCORE, process.getUserName(), "科目一", process.getExamScore(), "未通过"); schoolNotifyMessageSendService.sendMessage(process.getCoachId(), message, SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TYPE_ADMIN, process.getTenantId()); } @@ -385,7 +386,7 @@ public class ProcessServiceImpl extends ServiceImpl impl dlDriveSchoolStudentService.updateStudentPassAndGradTime(process.getExamTime(), process.getUserId(), process.getCourseId(), process.getTenantId()); String message = String.format(SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TEMPLATE_MEMBER_EXAM_SCORE, process.getUserName(), "科目四", process.getExamScore(), "已通过"); schoolNotifyMessageSendService.sendMessage(process.getCoachId(), message, SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TYPE_ADMIN, process.getTenantId()); - }else if(process.getSubject() == 4 && process.getExamStatus().equals("0")){ + } else if (process.getSubject() == 4 && process.getExamStatus().equals("0")) { String message = String.format(SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TEMPLATE_MEMBER_EXAM_SCORE, process.getUserName(), "科目四", process.getExamScore(), "未通过"); schoolNotifyMessageSendService.sendMessage(process.getCoachId(), message, SchoolBaseConstants.SCHOOL_NOTIFY_MESSAGE_TYPE_ADMIN, process.getTenantId()); }