diff --git a/app/Exports/CommonExport.php b/app/Exports/CommonExport.php index 8b1f56b..c4b1a5c 100755 --- a/app/Exports/CommonExport.php +++ b/app/Exports/CommonExport.php @@ -130,6 +130,9 @@ class CommonExport implements FromCollection, WithStyles, WithColumnWidths, With $widths[$letter] = 18; } elseif (str_contains($field, 'partners')) { $widths[$letter] = 50; + } elseif (str_contains($field, 'history_courses')) { + // 历史课程信息通常较长,适当放宽列宽 + $widths[$letter] = 40; } elseif (str_contains($field, 'all_course')) { $widths[$letter] = 40; } elseif (str_contains($field, 'company_name') || str_contains($field, 'address')) { @@ -361,6 +364,9 @@ class CommonExport implements FromCollection, WithStyles, WithColumnWidths, With $temp[$field] = $this->allCourse($info); } elseif (str_contains($field, 'partners')) { $temp[$field] = $this->partners($info); + } elseif (str_contains($field, 'history_courses')) { + // 历史课程信息字段,格式化为多行文本 + $temp[$field] = $this->historyCourses($info); } else { $temp[$field] = $this->getDotValue($info, $field); } @@ -495,6 +501,9 @@ class CommonExport implements FromCollection, WithStyles, WithColumnWidths, With $row[] = $this->allCourse($info); } elseif (str_contains($field, 'partners')) { $row[] = $this->partners($info); + } elseif (str_contains($field, 'history_courses')) { + // 历史课程信息字段,格式化为多行文本 + $row[] = $this->historyCourses($info); } else { $row[] = $this->getDotValue($info, $field); } @@ -542,6 +551,47 @@ class CommonExport implements FromCollection, WithStyles, WithColumnWidths, With return implode("、\r\n", $list); } + /** + * 获取所有历史课程信息(用于日历导出) + * @param $data + * @return string + */ + function historyCourses($data) + { + if (empty($data['history_courses']) || !is_array($data['history_courses'])) { + return ''; + } + + $list = []; + foreach ($data['history_courses'] as $item) { + $courseName = $item['course_name'] ?? ''; + $type = $item['type'] ?? ''; + $pass = $item['course_type_signs_pass'] ?? 0; + $passUnique = $item['course_type_signs_pass_unique'] ?? 0; + $signPass = $item['course_signs_pass'] ?? 0; + $start = $item['start_time'] ?? ''; + $end = $item['end_time'] ?? ''; + + // 构造单行描述:课程名称[体系ID](开始~结束) 培养人数/去重/课程人数 + $parts = []; + if ($courseName !== '') { + $parts[] = $courseName; + } + if ($type !== '') { + $parts[] = "[类型:{$type}]"; + } + if ($start !== '' || $end !== '') { + $parts[] = "({$start}~{$end})"; + } + $parts[] = "培养:{$pass}/去重:{$passUnique}/课程:{$signPass}"; + + $list[] = implode(' ', $parts); + } + + // 每门历史课程占一行 + return implode("\r\n", $list); + } + /** * 获取所有股东信息 * @param $data diff --git a/app/Http/Controllers/Admin/CompanyController.php b/app/Http/Controllers/Admin/CompanyController.php index 216210f..60a09ae 100644 --- a/app/Http/Controllers/Admin/CompanyController.php +++ b/app/Http/Controllers/Admin/CompanyController.php @@ -39,8 +39,6 @@ class CompanyController extends BaseController * tags={"公司管理"}, * summary="参数", * description="", - * @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string"), required=false, description="开始日期"), - * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=false, description="结束日期"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), * @OA\Response( * response="200", @@ -50,9 +48,6 @@ class CompanyController extends BaseController */ public function config() { - // 如果提供了开始时间和结束时间,则计算统计 - $start_date = request('start_date', CourseType::START_DATE); - $end_date = request('end_date', date('Y-m-d')); // 企业标签 $companiesTags = Company::where('company_tag', '!=', '')->pluck('company_tag'); $companiesTags = $companiesTags->flatten()->implode(','); @@ -63,17 +58,7 @@ class CompanyController extends BaseController }); $companiesTags = array_values($companiesTags); - // 累计被投企业数(从起始日期到结束日期) - $course_signs_invested = CourseSign::yhInvestedTotal(CourseType::START_DATE, $end_date, null); - - // 入学后被投企业数量(在指定时间范围内报名的学员所在公司中,在入学后被投的公司数量) - $company_invested_after_enrollment_total = CourseSign::companyInvestedAfterEnrollment($start_date, $end_date, null); - - // 今年范围内被投企业数(在指定时间范围内报名的学员所在公司中,被投时间在年份范围内的公司数量) - $company_invested_year_total = CourseSign::companyInvestedYear($start_date, $end_date, null); - - - return $this->success(compact('companiesTags', 'course_signs_invested', 'company_invested_after_enrollment_total', 'company_invested_year_total')); + return $this->success(compact('companiesTags')); } @@ -92,6 +77,10 @@ class CompanyController extends BaseController * @OA\Parameter(name="sort_name", in="query", @OA\Schema(type="string"), required=false, description="排序字段名字"), * @OA\Parameter(name="sort_type", in="query", @OA\Schema(type="string"), required=false, description="排序类型"), * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Parameter(name="start_year", in="query", @OA\Schema(type="string"), required=false, description="开始年份"), + * @OA\Parameter(name="end_year", in="query", @OA\Schema(type="string"), required=false, description="结束年份"), + * @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string"), required=false, description="开始日期(用于统计)"), + * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string"), required=false, description="结束日期(用于统计)"), * @OA\Parameter(name="course_type_id", in="query", @OA\Schema(type="string"), required=true, description="课程体系id"), * @OA\Parameter(name="course_name", in="query", @OA\Schema(type="string"), required=true, description="课程名称"), * @OA\Parameter(name="user_name", in="query", @OA\Schema(type="string"), required=true, description="学员名称"), @@ -105,6 +94,9 @@ class CompanyController extends BaseController public function index() { $all = request()->all(); + $start_year = $all['start_year'] ?? null; + $end_year = $all['end_year'] ?? null; + $list = $this->model->with([ 'users' => function ($query) use ($all) { $query->whereHas('courseSigns', function ($q) { @@ -128,7 +120,17 @@ class CompanyController extends BaseController if (isset($all['is_schoolmate'])) { $query->where('is_schoolmate', $all['is_schoolmate']); } - })->where(function ($query) use ($all) { + })->where(function ($query) use ($all, $start_year, $end_year) { + // 根据开始和结束年份筛选 project_users 中的 investDate + if ($start_year && $end_year) { + // 使用 LIKE 匹配 JSON 字符串中的年份范围 + $query->where(function ($q) use ($start_year, $end_year) { + for ($year = (int)$start_year; $year <= (int)$end_year; $year++) { + $q->orWhere('project_users', 'like', '%"investDate":"' . $year . '%'); + } + }); + } + if (isset($all['filter']) && !empty($all['filter'])) { foreach ($all['filter'] as $condition) { $key = $condition['key'] ?? null; @@ -200,7 +202,30 @@ class CompanyController extends BaseController // 输出 $list = $list->paginate($all['page_size'] ?? 20); } - return $this->success($list); + + // 计算统计数据(如果提供了开始和结束年份) + $statistics = [ + 'course_signs_invested' => 0, + 'company_invested_after_enrollment_total' => 0, + 'company_invested_year_total' => 0, + ]; + $start_date = $start_year ? $start_year . '-01-01' : CourseType::START_DATE; + $end_date = $end_year ? $end_year . '-12-31' : date('Y-m-d'); + if ($start_date && $end_date) { + // 累计被投企业数(从起始日期到结束日期) + $statistics['course_signs_invested'] = CourseSign::yhInvestedTotal(CourseType::START_DATE, $end_date, null); + + // 入学后被投企业数量(在指定时间范围内报名的学员所在公司中,在入学后被投的公司数量) + $statistics['company_invested_after_enrollment_total'] = CourseSign::companyInvestedAfterEnrollment($start_date, $end_date, null); + + // 年份范围内被投企业数(在指定时间范围内报名的学员所在公司中,被投时间在年份范围内的公司数量) + $statistics['company_invested_year_total'] = CourseSign::companyInvestedYear($start_date, $end_date, null); + } + + // 将统计数据添加到返回结果中 + $result = $list->toArray(); + $result['statistics'] = $statistics; + return $this->success($result); } /** diff --git a/app/Http/Controllers/Admin/EmployeeParticipationController.php b/app/Http/Controllers/Admin/EmployeeParticipationController.php new file mode 100644 index 0000000..c57fda6 --- /dev/null +++ b/app/Http/Controllers/Admin/EmployeeParticipationController.php @@ -0,0 +1,209 @@ +all(); + $list = $this->model->where(function ($query) use ($all) { + if (isset($all['filter']) && !empty($all['filter'])) { + foreach ($all['filter'] as $condition) { + $key = $condition['key'] ?? null; + $op = $condition['op'] ?? null; + $value = $condition['value'] ?? null; + if (!isset($key) || !isset($op) || !isset($value)) { + continue; + } + // 等于 + if ($op == 'eq') { + $query->where($key, $value); + } + // 不等于 + if ($op == 'neq') { + $query->where($key, '!=', $value); + } + // 大于 + if ($op == 'gt') { + $query->where($key, '>', $value); + } + // 大于等于 + if ($op == 'egt') { + $query->where($key, '>=', $value); + } + // 小于 + if ($op == 'lt') { + $query->where($key, '<', $value); + } + // 小于等于 + if ($op == 'elt') { + $query->where($key, '<=', $value); + } + // 模糊搜索 + if ($op == 'like') { + $query->where($key, 'like', '%' . $value . '%'); + } + // 否定模糊搜索 + if ($op == 'notlike') { + $query->where($key, 'not like', '%' . $value . '%'); + } + // 范围搜索 + if ($op == 'range') { + list($from, $to) = explode(',', $value); + if (empty($from) || empty($to)) { + continue; + } + $query->whereBetween($key, [$from, $to]); + } + } + } + })->orderBy($all['sort_name'] ?? 'id', $all['sort_type'] ?? 'desc'); + if (isset($all['is_export']) && !empty($all['is_export'])) { + $list = $list->get()->toArray(); + $export_fields = $all['export_fields'] ?? []; + // 导出文件名字 + $tableName = $this->model->getTable(); + $filename = (new CustomForm())->getTableComment($tableName); + return Excel::download(new BaseExport($export_fields, $list, $tableName), $filename . date('YmdHis') . '.xlsx'); + } else { + // 输出 + $list = $list->paginate($all['page_size'] ?? 20); + } + return $this->success($list); + } + + /** + * @OA\Get( + * path="/api/admin/employee-participations/show", + * tags={"员工参与"}, + * summary="详情", + * description="", + * @OA\Parameter(name="id", in="query", @OA\Schema(type="string"), required=true, description="id"), + * @OA\Parameter(name="show_relation", in="query", @OA\Schema(type="string"), required=false, description="需要输出的关联关系数组,填写输出指定数据"), + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Response( + * response="200", + * description="暂无" + * ) + * ) + */ + public function show() + { + $all = \request()->all(); + $messages = [ + 'id.required' => 'Id必填', + ]; + $validator = Validator::make($all, [ + 'id' => 'required' + ], $messages); + if ($validator->fails()) { + return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]); + } + $detail = $this->model->find($all['id']); + return $this->success($detail); + } + + /** + * @OA\Post( + * path="/api/admin/employee-participations/save", + * tags={"员工参与"}, + * summary="保存", + * description="", + * @OA\Parameter(name="id", in="query", @OA\Schema(type="int"), required=false, description="Id(存在更新,不存在新增)"), + * @OA\Parameter(name="type", in="query", @OA\Schema(type="integer"), required=true, description="类型:1员工参与数,2干部培训数"), + * @OA\Parameter(name="start_date", in="query", @OA\Schema(type="string", format="date"), required=false, description="开始日期"), + * @OA\Parameter(name="end_date", in="query", @OA\Schema(type="string", format="date"), required=false, description="结束日期"), + * @OA\Parameter(name="total", in="query", @OA\Schema(type="integer", format="int64"), required=false, description="数量"), + * @OA\Parameter(name="course_type_id", in="query", @OA\Schema(type="integer", format="int64"), required=false, description="课程类型ID"), + * @OA\Parameter(name="course_name", in="query", @OA\Schema(type="string", nullable=true), description="课程名称"), + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="认证token"), + * @OA\Response( + * response="200", + * description="操作成功" + * ) + * ) + */ + public function save() + { + $all = \request()->all(); + DB::beginTransaction(); + try { + if (isset($all['id'])) { + $model = $this->model->find($all['id']); + if (empty($model)) { + return $this->fail([ResponseCode::ERROR_BUSINESS, '数据不存在']); + } + } else { + $model = $this->model; + } + $model->fill($all); + $model->save(); + DB::commit(); + return $this->success($model); + } catch (\Exception $exception) { + DB::rollBack(); + return $this->fail([$exception->getCode(), $exception->getMessage()]); + } + } + + /** + * @OA\Get( + * path="/api/admin/employee-participations/destroy", + * tags={"员工参与"}, + * summary="删除", + * description="", + * @OA\Parameter(name="id", in="query", @OA\Schema(type="string"), required=true, description="id"), + * @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"), + * @OA\Response( + * response="200", + * description="暂无" + * ) + * ) + */ + public function destroy() + { + return parent::destroy(); + } + +} + diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index ba42a4d..03e75e2 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -127,7 +127,7 @@ class OtherController extends CommonController // 今年新增校友数 $list['schoolmate_year'] = User::where('is_schoolmate', 1)->where('created_at', 'like', '%' . date('Y') . '%')->count(); // 投后企业 - $list['company_invested_total'] = CourseSign::yhInvested(); + $list['company_invested_total'] = CourseSign::yhInvestedTotal(CourseType::START_DATE, date('Y-m-d'), null); // 元和员工参与人数 $list['company_join_total'] = CourseSign::companyJoin(); // 全市干部参与企业 @@ -142,20 +142,31 @@ class OtherController extends CommonController $list['cover_stock_total'] = CourseSign::shangshi(); // 本月课程 $monthCourses = Calendar::with('course.teacher') - ->where('date', 'like', '%' . date('Y-m') . '%') + ->where('start_time', 'like', '%' . date('Y-m') . '%') ->get(); // 课程统计 - $courseTypes = CourseType::where('is_chart', 1)->get(); + $courseTypes = CourseType::where('is_chart', 1)->where('is_history', 0)->get(); $start_date = CourseType::START_DATE; $end_date = date('Y-m-d'); foreach ($courseTypes as $courseType) { + // 历史已开设期数 + $historyCourse = HistoryCourse::whereHas('typeDetail', function ($query) use ($courseType) { + $query->where('name', 'like', '%' . $courseType->name . '%'); + })->get(); + // 历史课程期数 + $courseType->history_course_periods_total = $historyCourse->count(); + // 历史课程培养人数去重 + $courseType->history_course_signs_total = $historyCourse->sum('course_type_signs_pass_unique'); + // 课程 $courses = Course::where('type', $courseType->id)->get(); // 已开设期数 - $courseType->course_periods_total = Course::where('type', $courseType->id)->count(); + $courseType->course_periods_total = Course::where('type', $courseType->id)->count() + $courseType->history_course_periods_total; // 培养人数去重 - $courseType->course_signs_total = CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), null); + $courseType->course_signs_total = $courseType->history_course_signs_total + CourseSign::courseSignsTotalByUnique($start_date, $end_date, 1, $courses->pluck('id'), null); } + + // 苏州区域数据 $suzhouArea = Company::where('company_city', '苏州市')->groupBy('company_area') ->whereNotNull('company_area') @@ -340,10 +351,10 @@ class OtherController extends CommonController $courseTypesSum[] = [ 'course_type' => $historyCourse->name, 'course_name' => $course->course_name, - // 培养人数 - 'course_type_signs_pass' => $course->course_type_signs_pass, - // 去重培养人数 - 'course_type_signs_pass_unique' => $course->course_type_signs_pass_unique, + // 课程类型培养人数 + 'course_type_signs_pass' => $courses3->sum('course_type_signs_pass'), + // 课程类型去重培养人数 + 'course_type_signs_pass_unique' => $courses3->sum('course_type_signs_pass_unique'), // 课程人数 'course_signs_pass' => $course->course_signs_pass, // 跟班学员数量 diff --git a/app/Models/CourseSign.php b/app/Models/CourseSign.php index 2683f4f..cc97210 100755 --- a/app/Models/CourseSign.php +++ b/app/Models/CourseSign.php @@ -176,7 +176,7 @@ class CourseSign extends SoftDeletesModel * @param array|null $course_ids 课程ID(仅在自定义时间时生效) * @param bool $retList 是否返回列表 */ - public static function yhInvestedTotal($start_date = null, $end_date = null, $course_ids, $retList = false) + public static function yhInvestedTotal($start_date = null, $end_date = null, $course_ids = null, $retList = false) { // 默认时间:获取所有学员,不限制课程 $userIds = self::getStudentList($start_date, $end_date, 1, $course_ids)->get()->pluck('user_id'); @@ -598,8 +598,18 @@ class CourseSign extends SoftDeletesModel // 返回列表 return $list; } else { + // 基础数据 + $baseCount = $list->count(); + // 额外数据 + $employeeParticipations = EmployeeParticipation::where(function ($query) use ($start_date, $end_date) { + // 开始结束日期的筛选。or查询 + if ($start_date && $end_date) { + $query->whereBetween('start_date', [$start_date, $end_date]) + ->orWhereBetween('end_date', [$start_date, $end_date]); + } + })->where('type', 1)->sum('total'); // 返回统计数据 - return $list->count(); + return $baseCount + $employeeParticipations; } } @@ -626,7 +636,16 @@ class CourseSign extends SoftDeletesModel if ($retList) { return User::with('company')->whereIn('id', $courseSigns->pluck('user_id'))->get(); } else { - return User::whereIn('id', $courseSigns->pluck('user_id'))->count(); + $baseCount = User::whereIn('id', $courseSigns->pluck('user_id'))->count(); + // 额外数据 + $employeeParticipations = EmployeeParticipation::where(function ($query) use ($start_date, $end_date) { + // 开始结束日期的筛选。or查询 + if ($start_date && $end_date) { + $query->whereBetween('start_date', [$start_date, $end_date]) + ->orWhereBetween('end_date', [$start_date, $end_date]); + } + })->where('type', 2)->sum('total'); + return $baseCount + $employeeParticipations; } } diff --git a/app/Models/EmployeeParticipation.php b/app/Models/EmployeeParticipation.php new file mode 100644 index 0000000..42367cc --- /dev/null +++ b/app/Models/EmployeeParticipation.php @@ -0,0 +1,34 @@ + [ + 1 => '员工参与数', + 2 => '干部培训数', + ], + ]; + + /** + * 获取类型文本 + */ + public function getTypeTextAttribute() + { + return self::$intToString['type'][$this->type] ?? ''; + } + + /** + * 关联课程类型 + */ + public function courseType() + { + return $this->hasOne(CourseType::class, 'id', 'course_type_id'); + } +} + diff --git a/database/migrations/2025_11_29_112835_create_employee_participations_table.php b/database/migrations/2025_11_29_112835_create_employee_participations_table.php new file mode 100644 index 0000000..47ec5b9 --- /dev/null +++ b/database/migrations/2025_11_29_112835_create_employee_participations_table.php @@ -0,0 +1,39 @@ +comment('员工参与表'); + $table->increments('id'); + $table->tinyInteger('type')->nullable()->comment('类型:1员工参与数,2干部培训数'); + $table->date('start_date')->nullable()->comment('开始日期'); + $table->date('end_date')->nullable()->comment('结束日期'); + $table->integer('total')->nullable()->comment('数量'); + $table->integer('course_type_id')->nullable()->comment('课程类型ID'); + $table->string('course_name')->nullable()->comment('课程名称'); + $table->dateTime('created_at')->nullable(); + $table->dateTime('updated_at')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('employee_participations'); + } +}; + diff --git a/routes/api.php b/routes/api.php index 8f25459..b8bf19f 100755 --- a/routes/api.php +++ b/routes/api.php @@ -263,6 +263,11 @@ Route::group(["namespace" => "Admin", "prefix" => "admin"], function () { Route::post('history-courses/save', [\App\Http\Controllers\Admin\HistoryCourseController::class, "save"]); Route::get('history-courses/destroy', [\App\Http\Controllers\Admin\HistoryCourseController::class, "destroy"]); + // 员工参与 + Route::get('employee-participations/index', [\App\Http\Controllers\Admin\EmployeeParticipationController::class, "index"]); + Route::get('employee-participations/show', [\App\Http\Controllers\Admin\EmployeeParticipationController::class, "show"]); + Route::post('employee-participations/save', [\App\Http\Controllers\Admin\EmployeeParticipationController::class, "save"]); + Route::get('employee-participations/destroy', [\App\Http\Controllers\Admin\EmployeeParticipationController::class, "destroy"]); // 统计数据配置管理 Route::get('statistics-configs/index', [\App\Http\Controllers\Admin\StatisticsConfigController::class, "index"]);