diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 165108d..7fdc4cc 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -310,7 +310,7 @@ class OtherController extends CommonController // 审核通过人数 $list['course_signs_pass'] = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id')); // 审核通过人数去重 - $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), null); + $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), false); // 开课场次 $list['course_total'] = Calendar::getCourseTotal($start_date, $end_date, $course_type_id); // 开课天数 diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 629c7e1..3585156 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -168,6 +168,7 @@ class UserController extends BaseController * @OA\Parameter(name="courses_end_date", in="query", @OA\Schema(type="string"), required=false, description="课程结束时间"), * @OA\Parameter(name="is_vip", in="query", @OA\Schema(type="string"), required=false, description="是否vip0否1是"), * @OA\Parameter(name="courses_ing", in="query", @OA\Schema(type="string"), required=false, description="是否课程进行中0否1是"), + * @OA\Parameter(name="is_chart", in="query", @OA\Schema(type="string"), required=false, description="课程是否参与统计0否1是"), * @OA\Parameter(name="is_schoolmate", in="query", @OA\Schema(type="string"), required=false, description="是否校友0否1是"), * @OA\Parameter(name="mobile", in="query", @OA\Schema(type="string"), required=false, description="手机号"), * @OA\Parameter(name="status", in="query", @OA\Schema(type="string"), required=false, description="审核状态:0待审核,1通过,2不通过"), @@ -299,6 +300,10 @@ class UserController extends BaseController $query->where('start_date', '<=', date('Y-m-d'))->where('end_date', '>=', date('Y-m-d')); }); } + // 课程是否参与统计:0否 1是 + if (isset($all['is_chart'])) { + $q->where('is_chart', $all['is_chart']); + } }); }); // 不通过的需要全部不通过