diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index bc3d0ed..95bd183 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -17,6 +17,7 @@ use App\Models\CustomFormField; use App\Models\Department; use App\Models\HistoryCourse; use App\Models\ParameterDetail; +use App\Models\StockCompany; use App\Models\SupplyDemand; use App\Models\TimeEvent; use App\Models\User; @@ -274,11 +275,12 @@ class OtherController extends CommonController // 跟班学员数(在指定时间范围内报名的学员中,from为'跟班学员'的数量) $list['ganbu_total'] = CourseSign::genban($start_date, $end_date, $course_ids); - // 今年上市公司数量(stock_date在今年) - $list['company_market_year_total'] = CourseSign::companyMarketYear($start_date, $end_date, $course_ids); + // 今年上市公司数量(从stock_companys表获取,stock_date在今年) + $currentYear = date('Y'); + $list['company_market_year_total'] = StockCompany::whereYear('stock_date', $currentYear)->count(); - // 入学后上市公司数量(在指定时间范围内报名的学员所在公司中,在入学后上市的公司数量) - $list['company_market_after_enrollment_total'] = CourseSign::companyMarketAfterEnrollment($start_date, $end_date, $course_ids); + // 入学后上市公司数量(从stock_companys表获取,is_after_enrollment = 1) + $list['company_market_after_enrollment_total'] = StockCompany::where('is_after_enrollment', 1)->count(); // 累计被投企业数 $list['course_signs_invested'] = CourseSign::yhInvestedTotal(CourseType::START_DATE, $end_date, $course_ids);