From 5b2b3b9d9d83123dc703468eee9908fb1ff99ca9 Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Tue, 15 Oct 2024 16:40:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=BB=B7=E6=A0=BCisbuy?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/medical/service/impl/CourseMedicalServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java index 72a85bba..80d81501 100644 --- a/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java +++ b/src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java @@ -118,7 +118,7 @@ public class CourseMedicalServiceImpl extends ServiceImpl courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort)); if (courseCatalogueEntities.size() > 0){ for (CourseCatalogueEntity cc:courseCatalogueEntities){ - if ("0".equals(vip)||"2".equals(vip)){ + if ("0".equals(vip)||"3".equals(vip)){ Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper() .eq(UserCourseBuyEntity::getCatalogueId, cc.getId()) .eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId())); From 4e969a022f401c95f6c71f6edbd349113e4a94ad Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Wed, 16 Oct 2024 10:26:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0zk=E5=BC=80=E5=85=B3=20?= =?UTF-8?q?=E5=BC=80=E7=8F=AD=E6=98=AF=E6=A0=A1=E9=AA=8C=E9=A2=98=E5=BA=93?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/common/entity/CourseEntity.java | 4 ++++ .../service/impl/ClassEntityServiceImpl.java | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java index 99cb314e..775eaa69 100644 --- a/src/main/java/com/peanut/modules/common/entity/CourseEntity.java +++ b/src/main/java/com/peanut/modules/common/entity/CourseEntity.java @@ -31,6 +31,10 @@ public class CourseEntity { private String content; + private String plan; + + private String canzk; + private String relationProductIds; private Date createTime; 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 150a050a..8b1dbf7c 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 @@ -51,6 +51,8 @@ public class ClassEntityServiceImpl extends ServiceImpl classCourses = classCourseDao.selectList(new LambdaQueryWrapper() + .eq(ClassCourse::getModelId,classModel.getId())); + for (ClassCourse classCourse : classCourses) { + CourseEntity course = courseDao.selectById(classCourse.getCourseId()); + int singleCount = classExamSubjectDao.selectCount(new LambdaQueryWrapper() + .eq(ClassExamSubject::getCourseId,classCourse.getCourseId()).eq(ClassExamSubject::getType,"0")); + if (singleCount() + .eq(ClassExamSubject::getCourseId,classCourse.getCourseId()).eq(ClassExamSubject::getType,"1")); + if (multipleCount userList = classUserDao.selectList(new LambdaQueryWrapper() .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0")); StringBuffer sb = new StringBuffer();