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(); 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()));