From 1ce98b5ec89fa468cee8740994c11494ed846985 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 20 Sep 2024 11:17:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=B7=B2=E7=BB=8F=E8=8E=B7?= =?UTF-8?q?=E5=BE=97=E8=AF=81=E4=B9=A6=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=86=8D=E6=AC=A1=E8=BF=9B=E5=85=A5=E8=AF=A5?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E7=8F=AD=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ClassEntityServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java index 5e6db3b3..2c755c36 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java @@ -52,6 +52,8 @@ public class ClassEntityServiceImpl extends ServiceImpl params) { @@ -650,9 +652,17 @@ public class ClassEntityServiceImpl extends ServiceImpl courseList = classCourseDao.selectList(wrapper); - //关联课程是否有已进班的 if (courseList.size() > 0){ for (ClassCourse classCourse:courseList){ + //是否有拿过该课程证书 + int count = userCertificateDao.selectCount(new LambdaQueryWrapper() + .and(t->t.eq(UserCertificate::getType,"A").or().eq(UserCertificate::getType,"B")) + .eq(UserCertificate::getCourseId,classCourse.getCourseId()) + .eq(UserCertificate::getUserId,ShiroUtils.getUId())); + if (count>0){ + return R.error("已获得相关课程证书"); + } + //关联课程是否有已进班的 MPJLambdaWrapper courseWrapper = new MPJLambdaWrapper(); courseWrapper.leftJoin(ClassModel.class,ClassModel::getId,ClassCourse::getModelId); courseWrapper.leftJoin(ClassEntity.class,ClassEntity::getModelId,ClassModel::getId); @@ -799,9 +809,14 @@ public class ClassEntityServiceImpl extends ServiceImpl() .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId()) .lt(ClassTaskAndQuesReply::getScoreSuccess,2)); + int userNoCount = classTaskAndQuesReplyDao.selectCount(new LambdaQueryWrapper() + .eq(ClassTaskAndQuesReply::getRelationId,classTask.getId()) + .lt(ClassTaskAndQuesReply::getScoreSuccess,2) + .notLike(ClassTaskAndQuesReply::getScoreInfo,"\""+ShiroUtils.getUId()+"\"")); Map result = new HashMap<>(); result.put("setGiveHomeWorkNumber",alreadyReply); result.put("setNoGiveScoreNumber",noScore); + result.put("userNoCount",userNoCount); classTask.setOtherInfo(result); } return classTaskPage;