搜索条件新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseChapterSectionMapper.java

@@ -28,4 +28,7 @@ public interface CourseChapterSectionMapper extends BaseMapper<CourseChapterSect
 
     Integer rebuildCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
+
+    Integer learningCheck(@Param("typeId") Long typeId,@Param("gradeId") Long gradeId,
+                          @Param("userId") Long userId,@Param("moduleId") Long moduleId,@Param("chapterId") Long chapterId,@Param("examId") Long examId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseMenuMapper.java

@@ -26,4 +26,6 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
     Integer rebuildChapterCheck(@Param("chapterId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
 
     Integer rebuildModuleCheck(@Param("moduleId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
+
+    Integer learningCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId);
 }

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

@@ -140,11 +140,19 @@ public class CourseChapterSectionServiceImpl extends ServiceImpl<CourseChapterSe
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), bo.getModuleId(), bo.getChapterId(), 0L);
+                    if (learning > 0) {
+                        courseMenuVo.setLearning(1L);
+                    }
                 } else {
                     Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), 0L, bo.getChapterId(), courseMenuVo.getTypeId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getTypeId(), courseMenuVo.getGradeId(), bo.getUserId(), 0L, bo.getChapterId(), courseMenuVo.getTypeId());
+                    if (learning > 0) {
+                        courseMenuVo.setLearning(1L);
+                    }
                 }
             }
         }

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

@@ -178,6 +178,10 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
+                    Integer learning = baseMapper.learningCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
+                    if (learning > 0) {
+                        courseMenuVo.setLearning(1L);
+                    }
                 }
                 if (courseMenuVo.getType().equals(2)){
                     Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserChapterSectionVo.java

@@ -97,4 +97,8 @@ public class CourseUserChapterSectionVo {
 	/** 直播结束时间 */
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
+
+
+	@ApiModelProperty("1已学习")
+	private Long learning;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseUserMenuVo.java

@@ -70,6 +70,9 @@ public class CourseUserMenuVo {
 	@ApiModelProperty("直播结束时间")
 	private Long liveEndTime;
 
+	@ApiModelProperty("1已学习")
+	private Long learning;
+
 	/** 章模块关系 */
 	@Excel(name = "章模块关系")
 	@ApiModelProperty("章模块关系")

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

@@ -156,4 +156,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
+
+    <select id="learningCheck" parameterType="map"  resultType="integer">
+        SELECT
+            COUNT(up.id)
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id
+        WHERE
+            up.grade_id =#{gradeId}
+          AND up.user_id = #{userId}
+          AND up.module_id= #{moduleId}
+          and up.chapter_id=#{chapterId}
+          and up.section_id=#{typeId}
+          and up.exam_id=#{examId}
+          AND ups.period_status =1
+    </select>
 </mapper>

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

@@ -171,5 +171,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND ups.period_status =1
           and (ups.`status` = 0 or ups.`status` = 3)
     </select>
-
+    <select id="learningCheck" parameterType="map"  resultType="Integer">
+        SELECT
+            COUNT(up.id)
+        FROM
+            user_period up
+                LEFT JOIN user_period_status ups ON up.id = ups.period_id
+        WHERE
+            up.grade_id =#{gradeId}
+          AND up.user_id = #{userId}
+          AND up.module_id= 0
+          and up.chapter_id=0
+          and up.section_id=#{sectionId}
+          AND ups.period_status =1
+    </select>
 </mapper>