zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/zcc'

Browse Source
This commit is contained in:
wangjinlei
2024-10-16 13:15:19 +08:00
parent 078fc4c9f1 4e969a022f
commit e9924d16f3
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/peanut/modules/common/entity/CourseEntity.java
View File

@@ -31,6 +31,10 @@ public class CourseEntity {
private String content; private String content;
private String plan;
private String canzk;
private String relationProductIds; private String relationProductIds;
private Date createTime; private Date createTime;

20
src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java
View File

@@ -51,6 +51,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
@Autowired @Autowired
private ClassExamUserDao classExamUserDao; private ClassExamUserDao classExamUserDao;
@Autowired @Autowired
private ClassExamSubjectDao classExamSubjectDao;
@Autowired
private CourseCatalogueDao courseCatalogueDao; private CourseCatalogueDao courseCatalogueDao;
@Autowired @Autowired
private CourseCatalogueChapterDao courseCatalogueChapterDao; private CourseCatalogueChapterDao courseCatalogueChapterDao;
@@ -278,6 +280,24 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
return R.error("学生人数未满"); return R.error("学生人数未满");
} }
if (classModel.getIsExam()==1){
List<ClassCourse> classCourses = classCourseDao.selectList(new LambdaQueryWrapper<ClassCourse>()
.eq(ClassCourse::getModelId,classModel.getId()));
for (ClassCourse classCourse : classCourses) {
CourseEntity course = courseDao.selectById(classCourse.getCourseId());
int singleCount = classExamSubjectDao.selectCount(new LambdaQueryWrapper<ClassExamSubject>()
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId()).eq(ClassExamSubject::getType,"0"));
if (singleCount<Integer.parseInt(classModel.getExamProportion().split(":")[0])){
return R.error(course.getTitle()+"-单选题不足，请补充题库");
}
int multipleCount = classExamSubjectDao.selectCount(new LambdaQueryWrapper<ClassExamSubject>()
.eq(ClassExamSubject::getCourseId,classCourse.getCourseId()).eq(ClassExamSubject::getType,"1"));
if (multipleCount<Integer.parseInt(classModel.getExamProportion().split(":")[1])){
return R.error(course.getTitle()+"-多选题不足，请补充题库");
}
}
}
List<ClassUser> userList = classUserDao.selectList(new LambdaQueryWrapper<ClassUser>() List<ClassUser> userList = classUserDao.selectList(new LambdaQueryWrapper<ClassUser>()
.eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0")); .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0"));
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();

2
src/main/java/com/peanut/modules/medical/service/impl/CourseMedicalServiceImpl.java
View File

@@ -118,7 +118,7 @@ public class CourseMedicalServiceImpl extends ServiceImpl<CourseMedicineDao, Cou
List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort)); List<CourseCatalogueEntity> courseCatalogueEntities = courseCatalogueDao.selectList(new LambdaQueryWrapper<CourseCatalogueEntity>().eq(CourseCatalogueEntity::getCourseId, co.getId()).orderByAsc(CourseCatalogueEntity::getSort));
if (courseCatalogueEntities.size() > 0){ if (courseCatalogueEntities.size() > 0){
for (CourseCatalogueEntity cc:courseCatalogueEntities){ for (CourseCatalogueEntity cc:courseCatalogueEntities){
if ("0".equals(vip)||"2".equals(vip)){ if ("0".equals(vip)||"3".equals(vip)){
Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>() Integer i = userCourseBuyDao.selectCount(new LambdaQueryWrapper<UserCourseBuyEntity>()
.eq(UserCourseBuyEntity::getCatalogueId, cc.getId()) .eq(UserCourseBuyEntity::getCatalogueId, cc.getId())
.eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId())); .eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()));