Browse Source

提交:BUG处理

yangdamao 3 năm trước cách đây
mục cha
commit
dfc5adf937

+ 10 - 0
zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseController.java

@@ -119,6 +119,16 @@ public class CourseController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 获取课程小节观看权限
+     */
+    @ApiOperation("获取课程小节观看权限")
+    @GetMapping("/watch/per")
+    public AjaxResult<CourseSectionWatchPerVo> getSectionWatchPer(SectionWatchPerBo bo) {
+        CourseSectionWatchPerVo vo = iCourseSectionWatchPerService.getSectionWatchPer(bo);
+        return AjaxResult.success(vo);
+    }
+
     /**
      * 课程节观看权限校验
      */

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

@@ -681,12 +681,18 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 Map<String, List<UserStudyRecord>> collect = recordList.stream().filter(x -> ObjectUtils.isNotNull(x.getFromPlat())).collect(Collectors.groupingBy(UserStudyRecord::getFromPlat));
                 if (CollectionUtils.isNotEmpty(collect)) {
                     collect.forEach((k, v) -> {
-                        if (k.equals("1")) {
-                            //小程序
-                            item.setAppWatchNumber(collect.keySet().size());
-                        } else {
-                            //PC
-                            item.setAdminWatchNumber(collect.keySet().size());
+                        switch (k){
+                            case "1"://小程序
+                                Map<Long, List<UserStudyRecord>> rListMap = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                                item.setAppWatchNumber(rListMap.keySet().size());
+                                break;
+                            case "2"://PC
+//                                collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId))
+                                Map<Long, List<UserStudyRecord>> records = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                                item.setAdminWatchNumber(records.keySet().size());
+                                break;
+                            default:
+                                break;
                         }
                     });
                 }