Merge remote-tracking branch 'origin/zcc'

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;

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

@@ -51,6 +51,8 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
     @Autowired
     private ClassExamUserDao classExamUserDao;
     @Autowired
+    private ClassExamSubjectDao classExamSubjectDao;
+    @Autowired
     private CourseCatalogueDao courseCatalogueDao;
     @Autowired
     private CourseCatalogueChapterDao courseCatalogueChapterDao;
@@ -278,6 +280,24 @@ public class ClassEntityServiceImpl extends ServiceImpl<ClassEntityDao, ClassEnt
             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>()
                 .eq(ClassUser::getClassId,classEntity.getId()).eq(ClassUser::getRole,"0"));
         StringBuffer sb = new StringBuffer();

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

@@ -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));
                 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<UserCourseBuyEntity>()
                                     .eq(UserCourseBuyEntity::getCatalogueId, cc.getId())
                                     .eq(UserCourseBuyEntity::getUserId, ShiroUtils.getUId()));