fix 用户课程全部学习情况

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserStudyRecordController.java

@@ -8,6 +8,7 @@ import com.zhongzheng.framework.web.service.WxTokenService;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.vo.CourseUserMenuVo;
 import com.zhongzheng.modules.grade.domain.UserPeriodStatus;
+import com.zhongzheng.modules.grade.vo.ClassPeriodVo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordAddBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordEditBo;
 import com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo;
@@ -117,8 +118,10 @@ public class UserStudyRecordController extends BaseController {
      */
     @ApiOperation("查询课程所有子目录结构列表")
     @GetMapping("/menuAllList")
-    public AjaxResult<Integer> menuAllList(UserStudyRecordQueryBo bo) {
-        return AjaxResult.success(iUserStudyRecordService.menuAllList(bo) ? 1 : 0);
+    public AjaxResult<List<ClassPeriodVo>> menuAllList(UserStudyRecordQueryBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iUserStudyRecordService.menuAllList(bo));
     }
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -164,6 +164,10 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	@ApiModelProperty("以往审核记录")
 	private List<UserPeriodStatusVo> userPeriodStatusVos;
 
+	@Excel(name = "学习状态 0 未完整看完 1完整播放 -1未看过")
+	@ApiModelProperty("学习状态 0 未完整看完 1完整播放 -1未看过")
+	private Integer studyStatus;
+
 
 	@Override
 	public int compareTo(ClassPeriodVo o) {

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserStudyRecordMapper.java

@@ -76,4 +76,6 @@ public interface UserStudyRecordMapper extends BaseMapper<UserStudyRecord> {
     List<ClassPeriodVo> listChapterSection(UserStudyRecordQueryBo bo);
 
     List<ClassPeriodVo> listModuleChapter(UserStudyRecordQueryBo bo);
+
+    Integer getStudyStatus(ClassPeriodVo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserStudyRecordService.java

@@ -82,5 +82,5 @@ public interface IUserStudyRecordService extends IService<UserStudyRecord> {
 
 	boolean checkStudyOrder1(UserStudyRecordQueryBo entity);
 
-	boolean menuAllList(UserStudyRecordQueryBo bo);
+	List<ClassPeriodVo> menuAllList(UserStudyRecordQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -429,7 +429,7 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
      * @return
      */
     @Override
-    public boolean menuAllList(UserStudyRecordQueryBo bo) {
+    public List<ClassPeriodVo> menuAllList(UserStudyRecordQueryBo bo) {
         //存储整个目录节列表
         List<ClassPeriodVo> sectionList = new ArrayList<>();
         //获取课程目录
@@ -457,7 +457,6 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                         sectionList.add(classSectionVo);
                     }
                 }
-
             }
             //为章搜索节记录
             if (classPeriodVo.getType() == 2){
@@ -480,13 +479,15 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 classPeriodVo.setChapterId(0L);
                 classPeriodVo.setSectionId(classPeriodVo.getId());
                 sectionList.add(classPeriodVo);
-
             }
         }
-        System.out.println("事件"+sectionList.size());
-        System.out.println(sectionList);
-
-        return false;
+        for(ClassPeriodVo section : sectionList){
+            section.setGoodsId(bo.getGoodsId());
+            section.setGradeId(bo.getGradeId());
+            section.setUserId(bo.getUserId());
+            section.setStudyStatus(baseMapper.getStudyStatus(section));
+        }
+        return sectionList;
     }
 
 

zhongzheng-system/src/main/resources/mapper/modules/user/UserStudyRecordMapper.xml

@@ -1118,7 +1118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="listModuleChapter" parameterType="com.zhongzheng.modules.user.bo.UserStudyRecordQueryBo" resultMap="ClassPeriodVo">
         SELECT
         cmc.sort,
-        cc.chapter_id as id,
+        cmc.chapter_id as id,
         2 AS type
         FROM
          course_module_chapter cmc
@@ -1128,4 +1128,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND cmc.module_id=#{moduleId}
         </if>
     </select>
+
+    <select id="getStudyStatus" parameterType="com.zhongzheng.modules.grade.vo.ClassPeriodVo" resultType="Integer">
+        SELECT
+            IFNULL(status,-1)
+        FROM
+            user_study_record
+        WHERE
+            user_id = #{userId}
+          AND grade_id = #{gradeId}
+          AND course_id = #{courseId}
+          AND module_id = #{moduleId}
+          AND chapter_id = #{chapterId}
+          AND section_id = #{sectionId}
+          AND goods_id = #{goodsId}
+          AND `status` = 1
+          AND current_status = 1
+    </select>
 </mapper>