Browse Source

fix:视频课统计

liujunchi 2 years ago
parent
commit
93d610a4ab

+ 1 - 1
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ActivityPlanController.java

@@ -120,7 +120,7 @@ public class ActivityPlanController extends BaseController {
      */
     @PostMapping("/saveOrUpdateReward")
     @ApiOperation(value = "修改奖品")
-    @PreAuthorize("@pcs.hasPermissions('activityPlan/updateReward')")
+    @PreAuthorize("@pcs.hasPermissions('activityPlan/saveOrUpdateReward')")
     public HttpResponseResult saveOrUpdateReward(@Validated @RequestBody List<ActivityPlanRewardDto> updateRewardDtoList) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {

+ 3 - 2
cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -375,8 +375,9 @@
 		SELECT
 			COUNT(1) AS videoLessonCount,
 			(SELECT COUNT(1) FROM (SELECT COUNT(1) FROM video_lesson_purchase_record GROUP BY student_id_) a) AS payingUser,
-			(SELECT COUNT(1) FROM video_lesson_group_detail WHERE video_lesson_group_id_ IN (SELECT id_ FROM video_lesson_group WHERE audit_status_='PASS')) AS lessonCount
-		FROM video_lesson_group WHERE audit_status_='PASS'
+			(SELECT COUNT(1) FROM video_lesson_group_detail WHERE video_lesson_group_id_ IN
+											  (SELECT id_ FROM video_lesson_group WHERE audit_status_='PASS'  and shelves_flag_ = 1)) AS lessonCount
+		FROM video_lesson_group WHERE audit_status_='PASS' and shelves_flag_ = 1
 	</select>
 	<select id="selectVideoLesson" resultType="com.yonge.cooleshow.biz.dal.vo.CountVideoGroupVo$VideoLesson">
 		SELECT