学习计划

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseChapterSectionServiceImpl.java

@@ -133,16 +133,18 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
     public List<CourseUserChapterSectionVo> sectionList(CourseMenuQueryBo bo) {
         List<CourseUserChapterSectionVo> courseUserChapterSectionVos = courseChapterSectionMapper.sectionList(bo);
         courseUserChapterSectionVos.addAll(courseChapterSectionMapper.examList(bo));
-        for (CourseUserChapterSectionVo courseMenuVo : courseUserChapterSectionVos) {
-            if (courseMenuVo.getType().equals(1)){
-                Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getTypeId(),courseMenuVo.getGradeId(),bo.getUserId(),bo.getModuleId(),bo.getChapterId(),0L);
-                if (rebuild > 0){
-                    courseMenuVo.setRebuild(1);
-                }
-            }else {
-                Integer rebuild = baseMapper.rebuildCheck(0L,courseMenuVo.getGradeId(),bo.getUserId(),0L,bo.getChapterId(),courseMenuVo.getTypeId());
-                if (rebuild > 0){
-                    courseMenuVo.setRebuild(1);
+        if (bo.getUserId() != null) {
+            for (CourseUserChapterSectionVo courseMenuVo : courseUserChapterSectionVos) {
+                if (courseMenuVo.getType().equals(1)) {
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L);
+                    if (rebuild > 0) {
+                        courseMenuVo.setRebuild(1);
+                    }
+                } else {
+                    Integer rebuild = baseMapper.rebuildCheck(0L, courseMenuVo.getGradeId(), bo.getUserId(), 0L, bo.getChapterId(), courseMenuVo.getTypeId());
+                    if (rebuild > 0) {
+                        courseMenuVo.setRebuild(1);
+                    }
                 }
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -169,11 +170,13 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
     @Override
     public List<CourseUserMenuVo> menuList(CourseMenuQueryBo bo) {
         List<CourseUserMenuVo> courseMenuVos = baseMapper.menuList(bo);
-        for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
-            if (courseMenuVo.getType().equals(3)){
-                Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getId(),courseMenuVo.getGradeId(),bo.getUserId());
-                if (rebuild > 0){
-                    courseMenuVo.setRebuild(1);
+        if (bo.getUserId() != null) {
+            for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
+                if (courseMenuVo.getType().equals(3)) {
+                    Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    if (rebuild > 0) {
+                        courseMenuVo.setRebuild(1);
+                    }
                 }
             }
         }

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamNumberServiceImpl.java

@@ -5,8 +5,9 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.modules.exam.bo.ExamNumberGoodsAddBo;
+import com.zhongzheng.modules.exam.bo.*;
 import com.zhongzheng.modules.exam.domain.ExamNumberGoods;
+import com.zhongzheng.modules.exam.mapper.ExamApplyMapper;
 import com.zhongzheng.modules.exam.service.IExamNumberGoodsService;
 import com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +16,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.exam.bo.ExamNumberAddBo;
-import com.zhongzheng.modules.exam.bo.ExamNumberQueryBo;
-import com.zhongzheng.modules.exam.bo.ExamNumberEditBo;
 import com.zhongzheng.modules.exam.domain.ExamNumber;
 import com.zhongzheng.modules.exam.mapper.ExamNumberMapper;
 import com.zhongzheng.modules.exam.vo.ExamNumberVo;
@@ -42,6 +40,9 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
     @Autowired
     private IExamNumberGoodsService examNumberGoodsService;
 
+    @Autowired
+    private ExamApplyMapper examApplyMapper;
+
 
     @Override
     public ExamNumberVo queryById(Long examNumberId){
@@ -141,6 +142,13 @@ public class ExamNumberServiceImpl extends ServiceImpl<ExamNumberMapper, ExamNum
                         throw new IllegalArgumentException("当前商品已启用考次配置，不可开启,请重新创建新的配置考试次数和前培次数商品");
                     }
                 }
+                if (bo.getStatus() == 0){
+                    ExamNumberGoodsQueryBo examNumberGoodsQueryBo = new ExamNumberGoodsQueryBo();
+                    List<Integer> status = new ArrayList<>();
+                    status.add(1);
+                    examNumberGoodsQueryBo.setGoodsId(goodsId);
+                    List<ExamNumberGoodsVo> examNumberGoodsVos = examApplyMapper.listGoods(examNumberGoodsQueryBo);
+                }
                 ExamNumberGoodsAddBo examNumberGoodsAddBo = new ExamNumberGoodsAddBo();
                 examNumberGoodsAddBo.setGoodsId(goodsId);
                 examNumberGoodsAddBo.setExamNumberId(update.getExamNumberId());

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -367,7 +367,9 @@
                 LEFT JOIN goods g on cgg.goods_id = g.goods_id
                 LEFT JOIN class_grade cg on cg.grade_id = cgu.grade_id
         where 1=1
-          and cgu.user_id = #{userId}
+        <if test="userId != null and userId != ''">
+            and cgu.user_id = #{userId}
+        </if>
           and unix_timestamp(now()) BETWEEN cg.class_start_time and cg.class_end_time
           and cg.status =1
           and cgu.status =1