@@ -22,4 +22,8 @@ public interface CourseMenuMapper extends BaseMapper<CourseMenu> {
List<CourseUserMenuVo> menuList(CourseMenuQueryBo bo);
Integer rebuildCheck(@Param("sectionId") Long id,@Param("gradeId") Long gradeId,@Param("userId")Long userId);
+
+ Integer rebuildChapterCheck(@Param("sectionId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
+ Integer rebuildModuleCheck(@Param("sectionId")Long id,@Param("gradeId") Long gradeId,@Param("userId") Long userId);
}
@@ -178,6 +178,18 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
courseMenuVo.setRebuild(1);
+ if (courseMenuVo.getType().equals(2)){
+ Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getId(), courseMenuVo.getGradeId(), bo.getUserId());
+ if (rebuild > 0) {
+ courseMenuVo.setRebuild(1);
+ }
+ if (courseMenuVo.getType().equals(1)){
+ Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getId(), courseMenuVo.getGradeId(), bo.getUserId());
return courseMenuVos;
@@ -120,4 +120,9 @@ public class CourseUserVo {
/** 学习进度 */
@ApiModelProperty("总节数")
private Long secAllNum;
+ /** 1模块卷 2章卷 3试卷 */
+ @Excel(name = "1 需重修")
+ @ApiModelProperty("1 需重修")
+ private Integer rebuild;
@@ -375,6 +375,7 @@
UNION
SELECT
ups.id,
+ ups.period_id,
exam_name as name,
2 as type
FROM