master
cody 2 weeks ago
parent 8985011dd1
commit a6b60569ff

@ -297,7 +297,7 @@ class OtherController extends CommonController
// 去重培养人数 // 去重培养人数
'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id'), false, false), 'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id'), false, false),
'course_name' => $course->name, 'course_name' => $course->name,
'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id],false,false), 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id], false, false),
// 跟班学员数量 // 跟班学员数量
'genban_total' => CourseSign::genban($start_date, $end_date, [$course->id]), 'genban_total' => CourseSign::genban($start_date, $end_date, [$course->id]),
// 被投企业数 // 被投企业数

@ -210,10 +210,10 @@ class UserController extends BaseController
$query->with('course.typeDetail')->orderBy('fee_status', 'desc'); $query->with('course.typeDetail')->orderBy('fee_status', 'desc');
} }
])->withCount([ ])->withCount([
'appointments' => function ($query) { 'appointments' => function ($query) {
$query->whereIn('status', [0, 1]); $query->whereIn('status', [0, 1]);
} }
]); ]);
// 是否被投企业 // 是否被投企业
if (isset($all['is_yh_invested'])) { if (isset($all['is_yh_invested'])) {
$list = $list->whereHas('company', function ($query) use ($all) { $list = $list->whereHas('company', function ($query) use ($all) {
@ -287,7 +287,7 @@ class UserController extends BaseController
} }
$list = $list->where(function ($query) use ($all) { $list = $list->where(function ($query) use ($all) {
if (isset($all['from'])) { if (isset($all['from'])) {
$query->where('from', $all['from']); $query->where('from', 'like', '%' . $all['from'] . '%');
} }
if (isset($all['is_vip'])) { if (isset($all['is_vip'])) {
$query->where('is_vip', $all['is_vip']); $query->where('is_vip', $all['is_vip']);
@ -540,8 +540,7 @@ class UserController extends BaseController
} else { } else {
if (in_array($k, ['company_type', 'type'])) { if (in_array($k, ['company_type', 'type'])) {
$list[$key][$k] = str_replace('、', ',', $value[$v]); $list[$key][$k] = str_replace('、', ',', $value[$v]);
$list[$key][$k] = str_replace('', ',', $list[$key][$k]); $list[$key][$k] = str_replace('', ',', $list[$key][$k]);;
;
} else { } else {
$list[$key][$k] = $value[$v]; $list[$key][$k] = $value[$v];
} }

Loading…
Cancel
Save