通知列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -194,6 +194,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                         userPeriodQueryBo.setExamId(classPeriodChapterVo.getId());
                         userPeriodQueryBo.setCourseId(classPeriodChapterVo.getCourseId());
                         userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                        userPeriodQueryBo.setUserId(classPeriodChapterVo.getUserId());
                         classPeriodChapterVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
                     }
                     if (classPeriodChapterVo.getType() == 2) {
@@ -203,6 +204,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
                             userPeriodQueryBo.setSectionId(classPeriodSectionVo.getId());
                             userPeriodQueryBo.setCourseId(classPeriodSectionVo.getCourseId());
                             userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                            userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
                             userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
                             userPeriodQueryBo.setModuleId(classPeriodVo.getId());
                             classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
@@ -214,11 +216,45 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
             }
             if (classPeriodVo.getType() == 2){
                 List<ClassPeriodSectionVo> classPeriodSectionVos = baseMapper.listPeriodSection(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
+                for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos) {
+                    UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                    userPeriodQueryBo.setSectionId(classPeriodSectionVo.getId());
+                    userPeriodQueryBo.setCourseId(classPeriodSectionVo.getCourseId());
+                    userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                    userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
+                    userPeriodQueryBo.setChapterId(classPeriodVo.getId());
+                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                }
                 List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
-
+                for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
+                    UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                    userPeriodQueryBo.setExamId(classPeriodSectionVo.getId());
+                    userPeriodQueryBo.setCourseId(classPeriodSectionVo.getCourseId());
+                    userPeriodQueryBo.setUserId(bo.getUserId());
+                    userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                    userPeriodQueryBo.setChapterId(classPeriodVo.getId());
+                    classPeriodSectionVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+                }
                 classPeriodSectionVos.addAll(classPeriodSectionVos1);
                 classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
             }
+            if (classPeriodVo.getType() == 3){
+                    UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                    userPeriodQueryBo.setCourseId(classPeriodVo.getCourseId());
+                    userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                    userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
+                    userPeriodQueryBo.setSectionId(classPeriodVo.getId());
+                    classPeriodVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+            }
+
+            if (classPeriodVo.getType() == 4){
+                UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
+                userPeriodQueryBo.setExamId(classPeriodVo.getId());
+                userPeriodQueryBo.setCourseId(classPeriodVo.getCourseId());
+                userPeriodQueryBo.setGoodsId(bo.getGoodsId());
+                userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
+                classPeriodVo.setUserPeriodStatusVos(userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo));
+            }
         }
         return classPeriodVos;
     }

zhongzheng-system/src/main/resources/mapper/modules/grade/UserPeriodStatusMapper.xml

@@ -21,28 +21,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             user_period_status ups
                 LEFT JOIN user_period up ON up.id = ups.period_id
-        WHERE
+        WHERE 1=1
         <if test="goodsId != null and goodsId != ''">
-            up.goods_id = #{goods_id}
+            and up.goods_id = #{goodsId}
         </if>
         <if test="userId != null and userId != ''">
-            up.user_id = #{userId}
+            and up.user_id = #{userId}
         </if>
         <if test="sectionId != null and sectionId != ''">
-            up.section_id = #{sectionId}
+            and up.section_id = #{sectionId}
         </if>
         <if test="moduleId != null and moduleId != ''">
-            up.module_id = #{moduleId}
+            and up.module_id = #{moduleId}
         </if>
 
         <if test="chapterId != null and chapterId != ''">
-            up.chapter_id = #{chapterId}
+            and up.chapter_id = #{chapterId}
         </if>
         <if test="courseId != null and courseId != ''">
-            up.course_id = #{courseId}
+            and up.course_id = #{courseId}
         </if>
         <if test="examId != null and examId != ''">
-            up.exam_id = #{examId}
+            and up.exam_id = #{examId}
         </if>
         ORDER BY
             ups.create_time asc