tanyuan
/
wx.sstbc.com
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
master
cody 4 weeks ago
parent 6e0a57108d
commit 27bee1ad2a
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File

42
app/Http/Controllers/Admin/OtherController.php
Unescape View File

@ -134,23 +134,23 @@ class OtherController extends CommonController
// ->where('start_date', '<=', $end_date) // ->where('start_date', '<=', $end_date)
// ->where('start_date', '>=', $start_date) // ->where('start_date', '>=', $start_date)
->get(); ->get();
// // 被投企业数 // 被投企业数
// $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date); $list['course_signs_invested'] = CourseSign::yhInvested($start_date, $end_date);
// // 报名人数 // 报名人数
// $list['course_signs_total'] = CourseSign::courseSignsTotal($start_date, $end_date); $list['course_signs_total'] = CourseSign::courseSignsTotal($start_date, $end_date);
// // 审核通过人数 // 审核通过人数
// $list['course_signs_pass'] = CourseSign::courseSignsTotal($start_date, $end_date, 1); $list['course_signs_pass'] = CourseSign::courseSignsTotal($start_date, $end_date, 1);
// // 审核通过人数去重 // 审核通过人数去重
// $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1); $list['course_signs_pass_unique'] = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1);
// // 开课场次 // 开课场次
// $calendar = Calendar::whereIn('course_id', $courses->pluck('id'))->whereBetween('date', [$start_date, $end_date])->get(); $calendar = Calendar::whereIn('course_id', $courses->pluck('id'))->whereBetween('date', [$start_date, $end_date])->get();
// $list['course_total'] = $calendar->count(); $list['course_total'] = $calendar->count();
// // 开课天数 // 开课天数
// $list['course_day_total'] = $calendar->sum(function ($course) { $list['course_day_total'] = $calendar->sum(function ($course) {
// $start = Carbon::parse($course->start_time); $start = Carbon::parse($course->start_time);
// $end = Carbon::parse($course->end_time); $end = Carbon::parse($course->end_time);
// return $end->diffInDays($start) + 1; // 包含起始和结束日期 return $end->diffInDays($start) + 1; // 包含起始和结束日期
// }); });
// 课程分类明细统计 // 课程分类明细统计
$courseTypesSum = []; $courseTypesSum = [];
$courseTypes = CourseType::whereIn('id', $course_type_id)->get(); $courseTypes = CourseType::whereIn('id', $course_type_id)->get();
@ -164,23 +164,23 @@ class OtherController extends CommonController
$courseTypesSum[] = [ $courseTypesSum[] = [
'course_type' => $courseType->name, 'course_type' => $courseType->name,
// 培养人数 // 培养人数
// 'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')), 'course_type_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses2->pluck('id')),
// 去重培养人数 // 去重培养人数
'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id')), 'course_type_signs_pass_unique' => CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses2->pluck('id')),
'course_name' => $course->name, 'course_name' => $course->name,
// 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]), 'course_signs_pass' => CourseSign::courseSignsTotal($start_date, $end_date, 1, [$course->id]),
]; ];
} }
} }
// 区域明细统计 // 区域明细统计
$areas = ParameterDetail::where('parameter_id', 5)->get(); $areas = ParameterDetail::where('parameter_id', 5)->get();
foreach ($areas as $area) { foreach ($areas as $area) {
// $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value); $area->course_signs_pass = CourseSign::courseSignsTotal($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
$area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value); $area->course_signs_pass_unique = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), $area->value);
} }
$area_course_signs_pass_total = collect($areas)->sum('course_signs_pass'); $area_course_signs_pass_total = collect($areas)->sum('course_signs_pass');
$area_course_signs_pass_unique_total = collect($areas)->sum('course_signs_pass_unique'); $area_course_signs_pass_unique_total = collect($areas)->sum('course_signs_pass_unique');
// return $this->success(compact('list', 'courseTypesSum', 'areas', 'area_course_signs_pass_total', 'area_course_signs_pass_unique_total')); return $this->success(compact('list', 'courseTypesSum', 'areas', 'area_course_signs_pass_total', 'area_course_signs_pass_unique_total'));
} }
/** /**

16
app/Models/CourseSign.php
Unescape View File

@ -111,14 +111,14 @@ class CourseSign extends SoftDeletesModel
$courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date) $courseSignByType = CourseSign::whereDate('created_at', '>=', $start_date)
->whereDate('created_at', '<=', $end_date) ->whereDate('created_at', '<=', $end_date)
->whereHas('user', function ($query) use ($area) { ->whereHas('user', function ($query) use ($area) {
if (isset($area)) { // if (isset($area)) {
if ($area == '苏州市外') { // if ($area == '苏州市外') {
$allArea = ParameterDetail::where('parameter_id', 5)->get(); // $allArea = ParameterDetail::where('parameter_id', 5)->get();
$query->whereNotIn('company_area', $allArea->pluck('value')); // $query->whereNotIn('company_area', $allArea->pluck('value'));
} else { // } else {
$query->where('company_area', $area); // $query->where('company_area', $area);
} // }
} // }
})->where(function ($query) use ($status, $course_ids) { })->where(function ($query) use ($status, $course_ids) {
if (isset($status)) { if (isset($status)) {
$query->where('status', $status); $query->where('status', $status);

32
app/Providers/EventServiceProvider.php
Unescape View File

@ -28,22 +28,22 @@ class EventServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
DB::listen( // DB::listen(
function ($query) { // function ($query) {
$tmp = str_replace('?', '"' . '%s' . '"', $query->sql); // $tmp = str_replace('?', '"' . '%s' . '"', $query->sql);
$qBindings = []; // $qBindings = [];
foreach ($query->bindings as $key => $value) { // foreach ($query->bindings as $key => $value) {
if (is_numeric($key)) { // if (is_numeric($key)) {
$qBindings[] = $value; // $qBindings[] = $value;
} else { // } else {
$tmp = str_replace(':' . $key, '"' . $value . '"', $tmp); // $tmp = str_replace(':' . $key, '"' . $value . '"', $tmp);
} // }
} // }
$tmp = vsprintf($tmp, $qBindings); // $tmp = vsprintf($tmp, $qBindings);
$tmp = str_replace("\\", "", $tmp); // $tmp = str_replace("\\", "", $tmp);
Log::info(' execution time: ' . $query->time . 'ms; ' . $tmp . "\n\t"); // Log::info(' execution time: ' . $query->time . 'ms; ' . $tmp . "\n\t");
} // }
); // );
} }
/** /**

Write Preview
Loading…
Cancel
Save