diff --git a/app/Admin/Controllers/AdminController.php b/app/Admin/Controllers/AdminController.php index b85eeab..5901274 100644 --- a/app/Admin/Controllers/AdminController.php +++ b/app/Admin/Controllers/AdminController.php @@ -41,6 +41,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); + return $this->renderException($th); } @@ -70,6 +71,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); + return $this->renderException($th); } @@ -92,6 +94,7 @@ abstract class AdminController extends Controller DB::commit(); } catch (Throwable $th) { DB::rollBack(); + return $this->renderException($th); } diff --git a/app/Admin/Controllers/AgreementController.php b/app/Admin/Controllers/AgreementController.php index fa3e10c..c0a2f52 100644 --- a/app/Admin/Controllers/AgreementController.php +++ b/app/Admin/Controllers/AgreementController.php @@ -3,15 +3,16 @@ namespace App\Admin\Controllers; use App\Admin\Services\AgreementService; +use App\Enums\CheckStatus; +use App\Enums\EmployeeStatus; +use App\Models\Agreement; +use App\Traits\HasCheckActions; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\{Storage}; +use Illuminate\Support\{Arr}; +use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; -use Slowlyo\OwlAdmin\Admin; -use App\Enums\{EmployeeStatus, CheckStatus}; -use App\Models\Agreement; -use Illuminate\Support\{Arr}; -use Illuminate\Support\Facades\{Storage}; -use Illuminate\Http\Request; -use App\Traits\HasCheckActions; /** * 合同管理 @@ -71,7 +72,7 @@ class AgreementController extends AdminController ->label('打包下载') ->api(admin_url('agreement/download?id=${id}')) ->level('link') - ->redirect(url('admin-api/_download_export') . '?path=${path}') + ->redirect(url('admin-api/_download_export').'?path=${path}') ->visibleOn('${ARRAYINCLUDES(row_actions, "download")}'), ]), ]); @@ -90,7 +91,7 @@ class AgreementController extends AdminController ->searchable() ->required(), amisMake()->ImageControl()->name('images')->label(__('agreement.images')) - ->receiver(admin_url('upload_image') . '?full-url=1') + ->receiver(admin_url('upload_image').'?full-url=1') ->multiple() ->draggable() ->joinValues(false), @@ -131,20 +132,21 @@ class AgreementController extends AdminController public function download(Request $request) { $model = Agreement::findOrFail($request->input('id')); - if (!$model->images || count($model->images) == 0) { + if (! $model->images || count($model->images) == 0) { return $this->response()->fail('没有图片下载'); } $zip = new \ZipArchive(); $filename = time().'.zip'; - $filepath = storage_path('app/' . $filename); + $filepath = storage_path('app/'.$filename); $zip->open($filepath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE); $baseUrl = Storage::disk('public')->url(''); - foreach($model->images as $item) { + foreach ($model->images as $item) { $path = str_replace($baseUrl, '', $item); $info = pathinfo($path); $zip->addFile(Storage::disk('public')->path($path), data_get($info, 'basename')); } $zip->close(); + return $this->response()->success(['path' => $filename]); } } diff --git a/app/Admin/Controllers/AppVersionController.php b/app/Admin/Controllers/AppVersionController.php index fa13c32..9aa3373 100644 --- a/app/Admin/Controllers/AppVersionController.php +++ b/app/Admin/Controllers/AppVersionController.php @@ -2,7 +2,6 @@ namespace App\Admin\Controllers; -use App\Admin\Controllers\AdminController; use App\Admin\Services\AppVersionService; use App\Enums\AppOs; use App\Enums\AppUpdateStrategy; diff --git a/app/Admin/Controllers/CockpitController.php b/app/Admin/Controllers/CockpitController.php index 7fed793..a05e9b2 100644 --- a/app/Admin/Controllers/CockpitController.php +++ b/app/Admin/Controllers/CockpitController.php @@ -62,8 +62,7 @@ class CockpitController extends Controller $endAt = $today->copy()->subDay(); return $statisticService->dailyLedgerTrend($startAt, $endAt); - } - elseif (in_array($last, ['180days', '365days'])) { + } elseif (in_array($last, ['180days', '365days'])) { // 按月 $months = match ($last) { '180days' => 6, // 6个月 @@ -116,10 +115,10 @@ class CockpitController extends Controller /** @var \Illuminate\Support\Collection */ $lotteryTypeLedgers = LedgerItem::select([ - 'date', - 'ledger_item_type_id', - DB::raw('SUM(sales) as sales'), - ]) + 'date', + 'ledger_item_type_id', + DB::raw('SUM(sales) as sales'), + ]) ->whereBetween('date', [$startAt->toDateString(), $endAt->toDateString()]) ->groupBy(['date', 'ledger_item_type_id']) ->get() @@ -134,6 +133,7 @@ class CockpitController extends Controller 'date' => $date, 'data' => $lotteryTypes->map(function ($lotteryType) use ($lotteryTypeLedgerItems) { $lotteryTypeLedgerItem = $lotteryTypeLedgerItems->get($lotteryType->key); + return [ 'id' => $lotteryType->key, 'name' => $lotteryType->name, @@ -144,8 +144,7 @@ class CockpitController extends Controller $startAt->addDay(); } - } - elseif (in_array($last, ['180days', '365days'])) { + } elseif (in_array($last, ['180days', '365days'])) { // 按月 $months = match ($last) { '180days' => 6, // 6个月 @@ -161,16 +160,16 @@ class CockpitController extends Controller /** @var \Illuminate\Support\Collection */ $lotteryTypeLedgers = LedgerItem::select([ - DB::raw("DATE_FORMAT(`date`, '%Y-%m') as month"), - 'ledger_item_type_id', - DB::raw('SUM(sales) as sales'), - ]) + DB::raw("DATE_FORMAT(`date`, '%Y-%m') as month"), + 'ledger_item_type_id', + DB::raw('SUM(sales) as sales'), + ]) ->whereBetween('date', [$startAt->toDateString(), $endAt->toDateString()]) ->groupBy(['month', 'ledger_item_type_id']) ->get() ->groupBy('month'); - for ($i=0; $i < $months; $i++) { + for ($i = 0; $i < $months; $i++) { $month = $startAt->format('Y-m'); $lotteryTypeLedgerItems = $lotteryTypeLedgers->get($month, collect())->keyBy('ledger_item_type_id'); @@ -179,6 +178,7 @@ class CockpitController extends Controller 'month' => $month, 'data' => $lotteryTypes->map(function ($lotteryType) use ($lotteryTypeLedgerItems) { $lotteryTypeLedgerItem = $lotteryTypeLedgerItems->get($lotteryType->key); + return [ 'id' => $lotteryType->key, 'name' => $lotteryType->name, diff --git a/app/Admin/Controllers/Finance/CommissionIncomeController.php b/app/Admin/Controllers/Finance/CommissionIncomeController.php index ab315aa..2e880cd 100644 --- a/app/Admin/Controllers/Finance/CommissionIncomeController.php +++ b/app/Admin/Controllers/Finance/CommissionIncomeController.php @@ -92,8 +92,7 @@ class CommissionIncomeController extends AdminController /** * 导出按钮 * - * @param bool $disableSelectedItem - * + * @param bool $disableSelectedItem * @return \Slowlyo\OwlAdmin\Renderers\Service */ protected function exportAction($disableSelectedItem = false) @@ -103,7 +102,7 @@ class CommissionIncomeController extends AdminController // 导出接口地址 $exportPath = $this->getExportPath(); // 按钮点击事件 - $event = fn($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; + $event = fn ($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; // 导出处理动作 $doAction = "doAction([{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:true}}},{actionType:'ajax',args:{api:{url:url.toString(),method:'get'}}},{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:false}}},{actionType:'custom',expression:'\${event.data.responseResult.responseStatus===0}',script:'window.open(\'{$downloadPath}?path=\'+event.data.responseResult.responseData.path)'}])"; // 按钮 @@ -130,7 +129,7 @@ class CommissionIncomeController extends AdminController */ protected function export() { - admin_abort_if(!class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); + admin_abort_if(! class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); // 默认在 storage/app/ 下 $path = sprintf('佣金收入-%s.xlsx', date('YmdHis')); @@ -138,7 +137,7 @@ class CommissionIncomeController extends AdminController $data = [$this->getCommissionIncomeStatistics()]; try { - fastexcel($data)->export(storage_path('app/' . $path), fn($row) => [ + fastexcel($data)->export(storage_path('app/'.$path), fn ($row) => [ '预期佣金' => $row['expected_commission'], '实际佣金' => $row['actual_commission'], '佣金差异' => $row['diff_commission'], diff --git a/app/Admin/Controllers/Finance/SalesStatisticController.php b/app/Admin/Controllers/Finance/SalesStatisticController.php index db1649d..fd2769d 100644 --- a/app/Admin/Controllers/Finance/SalesStatisticController.php +++ b/app/Admin/Controllers/Finance/SalesStatisticController.php @@ -89,12 +89,12 @@ class SalesStatisticController extends AdminController 'name' => $lotteryType->name, 'sales' => trim_zeros($statistic->sales ?? '0.00'), 'expenditure' => trim_zeros($statistic->expenditure ?? '0.00'), - 'real_sales' => match($lotteryType->value) { + 'real_sales' => match ($lotteryType->value) { '+' => $statistic->sales ?? '0.00', '-' => -($statistic->sales ?? '0.00'), default => 0, }, - 'real_expenditure' => match($lotteryType->value) { + 'real_expenditure' => match ($lotteryType->value) { '+' => $statistic->expenditure ?? '0.00', '-' => -($statistic->expenditure ?? '0.00'), default => 0, @@ -106,8 +106,7 @@ class SalesStatisticController extends AdminController /** * 导出按钮 * - * @param bool $disableSelectedItem - * + * @param bool $disableSelectedItem * @return \Slowlyo\OwlAdmin\Renderers\Service */ protected function exportAction($disableSelectedItem = false) @@ -117,7 +116,7 @@ class SalesStatisticController extends AdminController // 导出接口地址 $exportPath = $this->getExportPath(); // 按钮点击事件 - $event = fn($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; + $event = fn ($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; // 导出处理动作 $doAction = "doAction([{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:true}}},{actionType:'ajax',args:{api:{url:url.toString(),method:'get'}}},{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:false}}},{actionType:'custom',expression:'\${event.data.responseResult.responseStatus===0}',script:'window.open(\'{$downloadPath}?path=\'+event.data.responseResult.responseData.path)'}])"; // 按钮 @@ -144,7 +143,7 @@ class SalesStatisticController extends AdminController */ protected function export() { - admin_abort_if(!class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); + admin_abort_if(! class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); // 默认在 storage/app/ 下 $path = sprintf('销售统计-%s.xlsx', date('YmdHis')); @@ -152,7 +151,7 @@ class SalesStatisticController extends AdminController $data = $this->getLotteryTypeStatistics(); try { - fastexcel($data)->export(storage_path('app/' . $path), fn($row) => [ + fastexcel($data)->export(storage_path('app/'.$path), fn ($row) => [ '彩种' => $row['name'], '销量' => $row['sales'], '兑奖' => $row['expenditure'], diff --git a/app/Admin/Controllers/Finance/StoreStatisticController.php b/app/Admin/Controllers/Finance/StoreStatisticController.php index 8fa15b3..118bab7 100644 --- a/app/Admin/Controllers/Finance/StoreStatisticController.php +++ b/app/Admin/Controllers/Finance/StoreStatisticController.php @@ -71,8 +71,7 @@ class StoreStatisticController extends AdminController /** * 导出按钮 * - * @param bool $disableSelectedItem - * + * @param bool $disableSelectedItem * @return \Slowlyo\OwlAdmin\Renderers\Service */ protected function exportAction($disableSelectedItem = false) @@ -82,7 +81,7 @@ class StoreStatisticController extends AdminController // 导出接口地址 $exportPath = $this->getExportPath(); // 按钮点击事件 - $event = fn($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; + $event = fn ($script) => ['click' => ['actions' => [['actionType' => 'custom', 'script' => $script]]]]; // 导出处理动作 $doAction = "doAction([{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:true}}},{actionType:'ajax',args:{api:{url:url.toString(),method:'get'}}},{actionType:'setValue',componentId:'export-action',args:{value:{showExportLoading:false}}},{actionType:'custom',expression:'\${event.data.responseResult.responseStatus===0}',script:'window.open(\'{$downloadPath}?path=\'+event.data.responseResult.responseData.path)'}])"; // 按钮 @@ -109,7 +108,7 @@ class StoreStatisticController extends AdminController */ protected function export() { - admin_abort_if(!class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); + admin_abort_if(! class_exists('\Rap2hpoutre\FastExcel\FastExcel'), __('admin.export.please_install_laravel_excel')); // 默认在 storage/app/ 下 $path = sprintf('门店统计-%s.xlsx', date('YmdHis')); @@ -117,7 +116,7 @@ class StoreStatisticController extends AdminController $data = $this->getStoreRanking(); try { - fastexcel($data)->export(storage_path('app/' . $path), function($row) { + fastexcel($data)->export(storage_path('app/'.$path), function ($row) { return [ '排序' => $row['ranking'], '门店' => Arr::get($row, 'store.title'), diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index cf63740..83fb08b 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -6,7 +6,6 @@ use Illuminate\Http\JsonResponse; use Illuminate\Http\Resources\Json\JsonResource; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Controllers\AdminController; -use Slowlyo\OwlAdmin\Renderers\Action; use Slowlyo\OwlAdmin\Renderers\Card; use Slowlyo\OwlAdmin\Renderers\Chart; use Slowlyo\OwlAdmin\Renderers\Custom; diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php index 7977476..0d4476d 100644 --- a/app/Admin/Controllers/Hr/EmployeeController.php +++ b/app/Admin/Controllers/Hr/EmployeeController.php @@ -127,6 +127,7 @@ class EmployeeController extends AdminController if ($this->service->leave($user, $request->only(['leave_at']))) { return $this->response()->success(null, '操作成功'); } + return $this->response()->fail($this->service->getError()); } @@ -143,6 +144,7 @@ class EmployeeController extends AdminController protected function exportMap($row) { $jobs = data_get($row, 'jobs', []); + return [ __('employee.id') => data_get($row, 'id'), __('employee.name') => data_get($row, 'name'), diff --git a/app/Admin/Controllers/Hr/PromotionController.php b/app/Admin/Controllers/Hr/PromotionController.php index 8328cca..f57c801 100644 --- a/app/Admin/Controllers/Hr/PromotionController.php +++ b/app/Admin/Controllers/Hr/PromotionController.php @@ -4,7 +4,9 @@ namespace App\Admin\Controllers\Hr; use App\Admin\Controllers\AdminController; use App\Admin\Services\EmployeePromotionService; -use App\Enums\{EmployeeStatus, CheckStatus, PromotionStatus}; +use App\Enums\CheckStatus; +use App\Enums\EmployeeStatus; +use App\Enums\PromotionStatus; use App\Traits\HasCheckActions; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Form; diff --git a/app/Admin/Controllers/Plan/PlanController.php b/app/Admin/Controllers/Plan/PlanController.php index 883c198..e58572f 100644 --- a/app/Admin/Controllers/Plan/PlanController.php +++ b/app/Admin/Controllers/Plan/PlanController.php @@ -289,7 +289,7 @@ class PlanController extends AdminController ->icon('fa fa-send-o') ->level('link') ->confirmText('是否发布选中的任务计划？') - ->api('post:' . admin_url('/plan/plans/${id}/publish')); + ->api('post:'.admin_url('/plan/plans/${id}/publish')); } /** @@ -423,7 +423,7 @@ class PlanController extends AdminController ->id($workflowLogListId) ->api(admin_url('/api/workflow/logs?id=${taskable.workflow.id}')) ->visibleOn('${taskable_type === "'.(new TaskHygiene())->getMorphClass().'"}'), - ]); + ]); $drawer = Drawer::make() ->title(__('admin.show')) @@ -462,9 +462,9 @@ class PlanController extends AdminController $planableTypeHygiene = (new PlanHygiene())->getMorphClass(); return [ - $planableTypeLedger => ''.$this->planableTypeOptions()[$planableTypeLedger ].'', - $planableTypePerformance => ''.$this->planableTypeOptions()[$planableTypePerformance ].'', - $planableTypeHygiene => ''.$this->planableTypeOptions()[$planableTypeHygiene ].'', + $planableTypeLedger => ''.$this->planableTypeOptions()[$planableTypeLedger].'', + $planableTypePerformance => ''.$this->planableTypeOptions()[$planableTypePerformance].'', + $planableTypeHygiene => ''.$this->planableTypeOptions()[$planableTypeHygiene].'', ]; } } diff --git a/app/Admin/Controllers/SettingController.php b/app/Admin/Controllers/SettingController.php index f2f75e6..3519982 100644 --- a/app/Admin/Controllers/SettingController.php +++ b/app/Admin/Controllers/SettingController.php @@ -45,7 +45,7 @@ class SettingController extends AdminController amis()->SwitchControl('oss_config.use_ssl', '开启SSL')->value(false)->visibleOn('${upload_disk == "oss"}'), ]), Tab::make()->title('打卡设置')->body([ - amis()->NumberControl()->min(0)->name('sign.distance')->label('允许打卡的距离(米)') + amis()->NumberControl()->min(0)->name('sign.distance')->label('允许打卡的距离(米)'), ]), ]) ); diff --git a/app/Admin/Controllers/Store/EmployeeController.php b/app/Admin/Controllers/Store/EmployeeController.php index 5acfcda..70074a4 100644 --- a/app/Admin/Controllers/Store/EmployeeController.php +++ b/app/Admin/Controllers/Store/EmployeeController.php @@ -83,6 +83,7 @@ class EmployeeController extends AdminController protected function exportMap($row) { $jobs = data_get($row, 'jobs', []); + return [ __('employee.store_id') => data_get($row, 'store.title'), __('admin.username') => data_get($row, 'admin_user.username'), diff --git a/app/Admin/Controllers/Store/StoreController.php b/app/Admin/Controllers/Store/StoreController.php index 803e7c3..4db4264 100644 --- a/app/Admin/Controllers/Store/StoreController.php +++ b/app/Admin/Controllers/Store/StoreController.php @@ -153,8 +153,8 @@ class StoreController extends AdminController __('store.category_id') => data_get($row, 'category.name'), __('store.business_id') => data_get($row, 'business.name'), __('store.level_id') => data_get($row, 'level.name'), - __('store.profit_ratio') => data_get($row, 'profit_ratio') . '%', - __('store.region') => data_get($row, 'region.province') . '-' . data_get($row, 'region.city'), + __('store.profit_ratio') => data_get($row, 'profit_ratio').'%', + __('store.region') => data_get($row, 'region.province').'-'.data_get($row, 'region.city'), __('store.business_status') => data_get(BusinessStatus::options(), data_get($row, 'business_status'), ''), __('store.address') => data_get($row, 'address'), __('store.created_at') => data_get($row, 'created_at'), diff --git a/app/Admin/Controllers/Store/StoreProfitRatioLogController.php b/app/Admin/Controllers/Store/StoreProfitRatioLogController.php index de1782d..ed243b8 100644 --- a/app/Admin/Controllers/Store/StoreProfitRatioLogController.php +++ b/app/Admin/Controllers/Store/StoreProfitRatioLogController.php @@ -4,7 +4,6 @@ namespace App\Admin\Controllers\Store; use App\Admin\Controllers\AdminController; use App\Admin\Services\StoreProfitRatioLogService; -use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Page; /** diff --git a/app/Admin/Controllers/System/AdminUserController.php b/app/Admin/Controllers/System/AdminUserController.php index fc68080..d8ce0ee 100644 --- a/app/Admin/Controllers/System/AdminUserController.php +++ b/app/Admin/Controllers/System/AdminUserController.php @@ -76,7 +76,7 @@ class AdminUserController extends AdminController public function form(): Form { return $this->baseForm()->body([ - amis()->ImageControl('avatar', __('admin.admin_user.avatar'))->receiver(admin_url('upload_image') . '?full-url=1'), + amis()->ImageControl('avatar', __('admin.admin_user.avatar'))->receiver(admin_url('upload_image').'?full-url=1'), amis()->TextControl('name', __('admin.admin_user.name'))->required(), amis()->TextControl('username', __('admin.username'))->required(), amis()->TextControl('password', __('admin.password'))->type('input-password')->required()->validations(['minLength' => 6])->hiddenOn('${id > 0}'), diff --git a/app/Admin/Controllers/System/WorkflowController.php b/app/Admin/Controllers/System/WorkflowController.php index e2cb4f6..7530872 100644 --- a/app/Admin/Controllers/System/WorkflowController.php +++ b/app/Admin/Controllers/System/WorkflowController.php @@ -4,7 +4,8 @@ namespace App\Admin\Controllers\System; use App\Admin\Controllers\AdminController; use App\Admin\Services\{WorkFlowService}; -use App\Enums\{CheckType, CheckStatus}; +use App\Enums\CheckStatus; +use App\Enums\CheckType; use App\Models\Employee; use App\Models\Keyword; use App\Models\WorkflowCheck; @@ -242,7 +243,7 @@ class WorkflowController extends AdminController return $this->response()->fail('当前登录账户未关联员工'); } $log = WorkflowLog::find($request->input('id')); - if (!$log) { + if (! $log) { return $this->response()->fail('审核已取消'); } try { @@ -271,7 +272,7 @@ class WorkflowController extends AdminController return $this->response()->fail('当前登录账户未关联员工'); } $log = WorkflowLog::find($request->input('id')); - if (!$log) { + if (! $log) { return $this->response()->fail('审核已取消'); } try { @@ -295,7 +296,7 @@ class WorkflowController extends AdminController // 判断当前用户是否有权限审核 $user = Employee::with(['jobs'])->where('admin_user_id', Admin::user()->id)->first(); if ($user) { - foreach($list as &$item) { + foreach ($list as &$item) { $item->checkable = $item->check_status == CheckStatus::Processing && $this->service->authCheck($user, $item); } } diff --git a/app/Admin/Controllers/Train/BookController.php b/app/Admin/Controllers/Train/BookController.php index 4a78652..b52e919 100644 --- a/app/Admin/Controllers/Train/BookController.php +++ b/app/Admin/Controllers/Train/BookController.php @@ -2,13 +2,13 @@ namespace App\Admin\Controllers\Train; +use App\Admin\Components; use App\Admin\Controllers\AdminController; use App\Admin\Services\Train\BookService; +use App\Enums\BookType; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; -use App\Enums\BookType; -use App\Admin\Components; /** * 课件管理 @@ -65,18 +65,18 @@ class BookController extends AdminController ->valueField('key') ->required(), amisMake()->TextControl()->name('title')->label(__('train_book.title'))->required(), - amisMake()->ImageControl()->name('cover_image')->label(__('train_book.cover_image'))->receiver(admin_url('upload_image') . '?full-url=1'), + amisMake()->ImageControl()->name('cover_image')->label(__('train_book.cover_image'))->receiver(admin_url('upload_image').'?full-url=1'), amisMake()->TextControl()->name('description')->label(__('train_book.description')), amisMake()->RadiosControl()->options(BookType::options())->name('type')->label(__('train_book.type')), Components::make()->fuEditorControl('content', __('train_book.content'))->visibleOn('${type == '.BookType::Text->value.'}'), amisMake()->FileControl()->name('video')->label(__('train_book.video')) - ->receiver(admin_url('upload_file') . '?full-url=1') + ->receiver(admin_url('upload_file').'?full-url=1') ->startChunkApi(admin_url('start_chunk_upload_file')) ->chunkApi(admin_url('save_chunk_upload_file')) ->finishChunkApi(admin_url('finish_chunk_upload_file')) ->visibleOn('${type == '.BookType::Video->value.'}'), amisMake()->FileControl()->name('files')->label(__('train_book.files')) - ->receiver(admin_url('upload_file') . '?full-url=1') + ->receiver(admin_url('upload_file').'?full-url=1') ->multiple() ->joinValues(false) ->startChunkApi(admin_url('start_chunk_upload_file')) @@ -104,6 +104,7 @@ class BookController extends AdminController ['label' => __('train_book.video'), 'content' => amisMake()->Video()->src('${video}'), 'span' => 3, 'visibleOn' => '${type == '.BookType::Video->value.'}'], ['label' => __('train_book.files'), 'content' => $list, 'span' => 3, 'visibleOn' => '${type == '.BookType::File->value.'}'], ]; + return $this->baseDetail()->title('')->body(amisMake()->Property()->items($items)); } } diff --git a/app/Admin/Controllers/Train/ExaminationController.php b/app/Admin/Controllers/Train/ExaminationController.php index d5f2fd4..a5bb8a0 100644 --- a/app/Admin/Controllers/Train/ExaminationController.php +++ b/app/Admin/Controllers/Train/ExaminationController.php @@ -4,13 +4,15 @@ namespace App\Admin\Controllers\Train; use App\Admin\Controllers\AdminController; use App\Admin\Services\Train\ExaminationService; +use App\Enums\ExamStatus; +use App\Enums\QuestionCate; +use App\Models\Train\Examination; +use App\Models\Train\Question; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; -use App\Enums\{ExamStatus, QuestionCate}; -use App\Models\Train\{Question, Examination}; -use Illuminate\Http\Request; -use Illuminate\Support\Facades\DB; /** * 考试管理 @@ -56,7 +58,7 @@ class ExaminationController extends AdminController ->visibleOn('${exam_status == '.ExamStatus::None->value.'}'), amisMake()->DialogAction()->dialog( amisMake()->Dialog()->title('选择参考员工')->size('lg')->body( - amisMake()->Form()->api('post:' . admin_url('train/examinations/${id}/publish'))->body([ + amisMake()->Form()->api('post:'.admin_url('train/examinations/${id}/publish'))->body([ amisMake()->TransferControl() ->name('employee_id') ->source(admin_url('api/employees?enable=1')) @@ -69,11 +71,11 @@ class ExaminationController extends AdminController ]) ) ) - ->label(__('train_examination.publish')) - ->level('link') - ->visible(Admin::user()->can('admin.train.examinations.publish')) - ->visibleOn('${exam_status == '.ExamStatus::None->value.'}'), - amisMake()->AjaxAction()->api('post:' . admin_url('train/examinations/${id}/cancel')) + ->label(__('train_examination.publish')) + ->level('link') + ->visible(Admin::user()->can('admin.train.examinations.publish')) + ->visibleOn('${exam_status == '.ExamStatus::None->value.'}'), + amisMake()->AjaxAction()->api('post:'.admin_url('train/examinations/${id}/cancel')) ->label(__('train_examination.cancel')) ->level('link') ->confirmText('删除该考试下所有试卷记录, 是否确定?') @@ -95,7 +97,7 @@ class ExaminationController extends AdminController ->valueField('id') ->multiple(true) ->autoFill([ - 'questions' => '${items}' + 'questions' => '${items}', ]) ->value('${questions}') ->size('lg') @@ -151,25 +153,28 @@ class ExaminationController extends AdminController ]), amisMake()->TableColumn()->name('score')->label(__('train_examination.score')), ]); + return $this->baseDetail()->title('')->body([$detail, amisMake()->Divider(), $question]); } public function publish($id, Request $request) { $request->validate([ - 'employee_id' => 'required' + 'employee_id' => 'required', ]); $info = Examination::findOrFail($id); try { DB::beginTransaction(); - if (!$this->service->publish($info, $request->input('employee_id'))) { + if (! $this->service->publish($info, $request->input('employee_id'))) { return $this->response()->fail($this->service->getError()); } DB::commit(); + return $this->response()->success(); } catch (\Exception $e) { DB::rollBack(); + return $this->response()->fail($e->getMessage()); } @@ -182,13 +187,15 @@ class ExaminationController extends AdminController try { DB::beginTransaction(); - if (!$this->service->cancel($info)) { + if (! $this->service->cancel($info)) { return $this->response()->fail($this->service->getError()); } DB::commit(); + return $this->response()->success(); } catch (\Exception $e) { DB::rollBack(); + return $this->response()->fail($e->getMessage()); } } diff --git a/app/Admin/Controllers/Train/PaperController.php b/app/Admin/Controllers/Train/PaperController.php index 2511ac6..c7f88f3 100644 --- a/app/Admin/Controllers/Train/PaperController.php +++ b/app/Admin/Controllers/Train/PaperController.php @@ -4,10 +4,9 @@ namespace App\Admin\Controllers\Train; use App\Admin\Controllers\AdminController; use App\Admin\Services\Train\PaperService; -use Slowlyo\OwlAdmin\Admin; +use App\Enums\QuestionCate; use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; -use App\Enums\QuestionCate; /** * 成绩管理 @@ -64,6 +63,7 @@ class PaperController extends AdminController amisMake()->TableColumn()->name('score')->label(__('train_question.score')), amisMake()->TableColumn()->name('user_score')->label(__('train_question.user_score')), ]); + return $this->baseDetail()->title('')->body([$detail, amisMake()->Divider(), $question]); } } diff --git a/app/Admin/Controllers/Train/QuestionController.php b/app/Admin/Controllers/Train/QuestionController.php index dc132ad..9ea0a5c 100644 --- a/app/Admin/Controllers/Train/QuestionController.php +++ b/app/Admin/Controllers/Train/QuestionController.php @@ -4,10 +4,10 @@ namespace App\Admin\Controllers\Train; use App\Admin\Controllers\AdminController; use App\Admin\Services\Train\QuestionService; +use App\Enums\QuestionCate; use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Renderers\Form; use Slowlyo\OwlAdmin\Renderers\Page; -use App\Enums\QuestionCate; /** * 题库管理 @@ -84,6 +84,7 @@ class QuestionController extends AdminController ]), 'span' => 3], ])); } + public function shareList() { return $this->response()->success($this->service->list()); diff --git a/app/Admin/Filters/AgreementFilter.php b/app/Admin/Filters/AgreementFilter.php index cca774e..193b1b0 100644 --- a/app/Admin/Filters/AgreementFilter.php +++ b/app/Admin/Filters/AgreementFilter.php @@ -19,8 +19,8 @@ class AgreementFilter extends ModelFilter 'invitor_search' => 'search', ], 'workflow' => [ - 'check_status' => 'check_status' - ] + 'check_status' => 'check_status', + ], ]; public function employeeId($key) diff --git a/app/Admin/Filters/EmployeeFilter.php b/app/Admin/Filters/EmployeeFilter.php index df14fdc..d5934c5 100644 --- a/app/Admin/Filters/EmployeeFilter.php +++ b/app/Admin/Filters/EmployeeFilter.php @@ -12,7 +12,7 @@ class EmployeeFilter extends ModelFilter 'province_code' => 'province_code', 'province_code' => 'province_code', 'city_code' => 'city_code', - ] + ], ]; protected $drop_id = false; diff --git a/app/Admin/Filters/EmployeePromotionFilter.php b/app/Admin/Filters/EmployeePromotionFilter.php index 4cfef03..4022e05 100644 --- a/app/Admin/Filters/EmployeePromotionFilter.php +++ b/app/Admin/Filters/EmployeePromotionFilter.php @@ -22,8 +22,8 @@ class EmployeePromotionFilter extends ModelFilter 'invitor_search' => 'search', ], 'workflow' => [ - 'check_status' => 'check_status' - ] + 'check_status' => 'check_status', + ], ]; public function employeeId($key) diff --git a/app/Admin/Filters/OvertimeApplyFilter.php b/app/Admin/Filters/OvertimeApplyFilter.php index c82a777..a7f5c88 100644 --- a/app/Admin/Filters/OvertimeApplyFilter.php +++ b/app/Admin/Filters/OvertimeApplyFilter.php @@ -18,8 +18,8 @@ class OvertimeApplyFilter extends ModelFilter 'employee_search' => 'search', ], 'workflow' => [ - 'check_status' => 'check_status' - ] + 'check_status' => 'check_status', + ], ]; public function employeeId($key) diff --git a/app/Admin/Filters/StoreFilter.php b/app/Admin/Filters/StoreFilter.php index 79339aa..e2e8191 100644 --- a/app/Admin/Filters/StoreFilter.php +++ b/app/Admin/Filters/StoreFilter.php @@ -2,9 +2,9 @@ namespace App\Admin\Filters; +use App\Models\Keyword; use EloquentFilter\ModelFilter; use Illuminate\Support\Arr; -use App\Models\Keyword; class StoreFilter extends ModelFilter { diff --git a/app/Admin/Filters/TrainExaminationFilter.php b/app/Admin/Filters/TrainExaminationFilter.php index 728a7ff..b5144c6 100644 --- a/app/Admin/Filters/TrainExaminationFilter.php +++ b/app/Admin/Filters/TrainExaminationFilter.php @@ -10,6 +10,7 @@ class TrainExaminationFilter extends ModelFilter public function search($key) { $condition = '%'.$key.'%'; + return $this->where('name', 'like', $condition); } diff --git a/app/Admin/Filters/TrianPaperFilter.php b/app/Admin/Filters/TrianPaperFilter.php index c8d8f54..5dda27d 100644 --- a/app/Admin/Filters/TrianPaperFilter.php +++ b/app/Admin/Filters/TrianPaperFilter.php @@ -2,7 +2,6 @@ namespace App\Admin\Filters; -use Carbon\Carbon; use EloquentFilter\ModelFilter; class TrianPaperFilter extends ModelFilter diff --git a/app/Admin/Filters/TrianQuestionFilter.php b/app/Admin/Filters/TrianQuestionFilter.php index e1a5e96..c9e6b8e 100644 --- a/app/Admin/Filters/TrianQuestionFilter.php +++ b/app/Admin/Filters/TrianQuestionFilter.php @@ -10,6 +10,7 @@ class TrianQuestionFilter extends ModelFilter public function search($key) { $condition = '%'.$key.'%'; + return $this->where('title', 'like', $condition); } diff --git a/app/Admin/Middleware/CheckPermission.php b/app/Admin/Middleware/CheckPermission.php index 2ccf127..713e213 100644 --- a/app/Admin/Middleware/CheckPermission.php +++ b/app/Admin/Middleware/CheckPermission.php @@ -21,7 +21,7 @@ class CheckPermission '/finish_chunk_upload_file', '/upload_file', '/upload_image', - '/upload_rich' + '/upload_rich', ]; /** diff --git a/app/Admin/Services/AgreementService.php b/app/Admin/Services/AgreementService.php index 33bff2d..814ddc6 100644 --- a/app/Admin/Services/AgreementService.php +++ b/app/Admin/Services/AgreementService.php @@ -3,13 +3,12 @@ namespace App\Admin\Services; use App\Admin\Filters\AgreementFilter; -use App\Models\{Agreement, WorkflowCheck, Employee}; -use Illuminate\Support\Facades\{Validator, Storage}; -use Illuminate\Support\Str; -use Slowlyo\OwlAdmin\Admin; use App\Enums\CheckStatus; +use App\Models\Agreement; +use App\Models\Employee; +use Illuminate\Support\Facades\Validator; +use Slowlyo\OwlAdmin\Admin; use Slowlyo\OwlAdmin\Models\AdminUser; -use App\Exceptions\RuntimeException; class AgreementService extends BaseService { @@ -32,7 +31,7 @@ class AgreementService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -47,10 +46,10 @@ class AgreementService extends BaseService if ($user->can('admin.agreement.view')) { array_push($actions, 'view'); } - if ($user->can('admin.agreement.update') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.agreement.update') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'edit'); } - if ($user->can('admin.agreement.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.agreement.delete') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'delete'); } if ($user->can('admin.agreement.download') && in_array($model->workflow->check_status, [CheckStatus::Success])) { @@ -85,6 +84,7 @@ class AgreementService extends BaseService } $data['images'] = $images; } + return $data; } @@ -106,7 +106,7 @@ class AgreementService extends BaseService public function update($primaryKey, $data): bool { $model = $this->query()->whereKey($primaryKey)->firstOrFail(); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { return $this->setError('审核中, 无法修改'); } $data = $this->resloveData($data, $model); @@ -119,6 +119,7 @@ class AgreementService extends BaseService $model->update($data); $this->currentModel = $model; + return true; } @@ -128,6 +129,7 @@ class AgreementService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/AppVersionService.php b/app/Admin/Services/AppVersionService.php index b39d540..c1f2cd8 100644 --- a/app/Admin/Services/AppVersionService.php +++ b/app/Admin/Services/AppVersionService.php @@ -6,12 +6,9 @@ use App\Admin\Filters\AppVersionFilter; use App\Enums\AppOs; use App\Enums\AppUpdateStrategy; use App\Models\AppVersion; -use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Support\Arr; -use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -use Slowlyo\OwlAdmin\Admin; class AppVersionService extends BaseService { @@ -178,6 +175,7 @@ class AppVersionService extends BaseService 'apk_url' => $apkUrl, 'wgt_url' => $wgtUrl, ])); + return true; } } diff --git a/app/Admin/Services/BaseService.php b/app/Admin/Services/BaseService.php index 02e300a..b689ac9 100644 --- a/app/Admin/Services/BaseService.php +++ b/app/Admin/Services/BaseService.php @@ -2,8 +2,8 @@ namespace App\Admin\Services; -use Slowlyo\OwlAdmin\Services\AdminService; use Illuminate\Database\Eloquent\Model; +use Slowlyo\OwlAdmin\Services\AdminService; /** * @method Region getModel() @@ -104,6 +104,7 @@ class BaseService extends AdminService } $model->update($data); $this->currentModel = $model; + return true; } diff --git a/app/Admin/Services/EmployeePromotionService.php b/app/Admin/Services/EmployeePromotionService.php index 0b2eb47..97c25a6 100644 --- a/app/Admin/Services/EmployeePromotionService.php +++ b/app/Admin/Services/EmployeePromotionService.php @@ -3,17 +3,14 @@ namespace App\Admin\Services; use App\Admin\Filters\EmployeePromotionFilter; -use App\Admin\WorkflowService; use App\Enums\PromotionStatus; use App\Models\Employee; use App\Models\EmployeePromotion; +use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Validator; -use Illuminate\Support\Arr; use Slowlyo\OwlAdmin\Admin; -use App\Enums\CheckStatus; use Slowlyo\OwlAdmin\Models\AdminUser; -use App\Exceptions\RuntimeException; class EmployeePromotionService extends BaseService { @@ -36,7 +33,7 @@ class EmployeePromotionService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -51,10 +48,10 @@ class EmployeePromotionService extends BaseService if ($user->can('admin.hr.promotion.view')) { array_push($actions, 'view'); } - if ($user->can('admin.hr.promotion.update') && !in_array($model->promotion_status, [PromotionStatus::Processing, PromotionStatus::Success])) { + if ($user->can('admin.hr.promotion.update') && ! in_array($model->promotion_status, [PromotionStatus::Processing, PromotionStatus::Success])) { array_push($actions, 'edit'); } - if ($user->can('admin.hr.promotion.delete') && !in_array($model->promotion_status, [PromotionStatus::Processing, PromotionStatus::Success])) { + if ($user->can('admin.hr.promotion.delete') && ! in_array($model->promotion_status, [PromotionStatus::Processing, PromotionStatus::Success])) { array_push($actions, 'delete'); } if (in_array($model->promotion_status, [PromotionStatus::Processing])) { @@ -154,7 +151,7 @@ class EmployeePromotionService extends BaseService public function update($primaryKey, $data): bool { $model = $this->query()->whereKey($primaryKey)->firstOrFail(); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { return $this->setError('审核中, 无法修改'); } $data = $this->resloveData($data, $model); @@ -167,6 +164,7 @@ class EmployeePromotionService extends BaseService $model->update($data); $this->currentModel = $model; + return true; } @@ -176,6 +174,7 @@ class EmployeePromotionService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/EmployeeService.php b/app/Admin/Services/EmployeeService.php index db67a4b..2ffa015 100644 --- a/app/Admin/Services/EmployeeService.php +++ b/app/Admin/Services/EmployeeService.php @@ -3,15 +3,17 @@ namespace App\Admin\Services; use App\Admin\Filters\EmployeeFilter; -use App\Models\{Employee, EmployeeSignLog, HolidayApply, OvertimeApply, OfficalBusiness}; -use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; +use App\Admin\Services\System\AdminUserService; +use App\Enums\EmployeeStatus; +use App\Models\Employee; +use App\Models\EmployeeSignLog; +use App\Models\HolidayApply; +use App\Models\OfficalBusiness; +use App\Models\OvertimeApply; use Illuminate\Support\Arr; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Validator; use Slowlyo\OwlAdmin\Models\AdminUser; -use App\Admin\Services\System\AdminUserService; -use App\Enums\EmployeeStatus; class EmployeeService extends BaseService { @@ -64,7 +66,7 @@ class EmployeeService extends BaseService // 修改管理员 $adminUserService = AdminUserService::make(); - if (!$adminUserService->update($model->admin_user_id, Arr::only($data, ['password', 'confirm_password', 'name', 'avatar']))) { + if (! $adminUserService->update($model->admin_user_id, Arr::only($data, ['password', 'confirm_password', 'name', 'avatar']))) { return $this->setError($adminUserService->getError()); } diff --git a/app/Admin/Services/EmployeeSignRepairService.php b/app/Admin/Services/EmployeeSignRepairService.php index 42d7a00..b5eb7c3 100644 --- a/app/Admin/Services/EmployeeSignRepairService.php +++ b/app/Admin/Services/EmployeeSignRepairService.php @@ -3,13 +3,13 @@ namespace App\Admin\Services; use App\Admin\Filters\EmployeeSignRepairFilter; -use App\Models\{EmployeeSignRepair, Employee, WorkflowCheck, EmployeeSign, EmployeeSignLog}; -use Illuminate\Support\Facades\Validator; -use Illuminate\Validation\Rule; -use Slowlyo\OwlAdmin\Admin; use App\Enums\CheckStatus; use App\Models\AdminUser; -use App\Exceptions\RuntimeException; +use App\Models\Employee; +use App\Models\EmployeeSignLog; +use App\Models\EmployeeSignRepair; +use Illuminate\Support\Facades\Validator; +use Slowlyo\OwlAdmin\Admin; class EmployeeSignRepairService extends BaseService { @@ -32,7 +32,7 @@ class EmployeeSignRepairService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -47,7 +47,7 @@ class EmployeeSignRepairService extends BaseService if ($user->can('admin.hr.repairs.view')) { array_push($actions, 'view'); } - if ($user->can('admin.hr.repairs.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.hr.repairs.delete') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'delete'); } if (in_array($model->workflow->check_status, [CheckStatus::None, CheckStatus::Cancel, CheckStatus::Fail])) { @@ -92,13 +92,13 @@ class EmployeeSignRepairService extends BaseService if ($validator->fails()) { return $validator->errors()->first(); } - if (!$model) { + if (! $model) { // 已经打卡, 不能申请 if (EmployeeSignLog::filter([ 'date' => $data['date'], 'employee_id' => $data['employee_id'], - 'sign_time' => $data['sign_time'] - ])->exists()) { + 'sign_time' => $data['sign_time'], + ])->exists()) { return '已经补过卡了'; } // 同一天不能重复申请 @@ -120,6 +120,7 @@ class EmployeeSignRepairService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/EmployeeSignService.php b/app/Admin/Services/EmployeeSignService.php index 1ad8bf0..a0f6ff0 100644 --- a/app/Admin/Services/EmployeeSignService.php +++ b/app/Admin/Services/EmployeeSignService.php @@ -3,8 +3,14 @@ namespace App\Admin\Services; use App\Admin\Filters\EmployeeSignFilter; -use App\Enums\{SignStatus, SignTime, SignType}; -use App\Models\{Employee, EmployeeRest, EmployeeSign, EmployeeSignLog, EmployeeSignRepair}; +use App\Enums\SignStatus; +use App\Enums\SignTime; +use App\Enums\SignType; +use App\Models\Employee; +use App\Models\EmployeeRest; +use App\Models\EmployeeSign; +use App\Models\EmployeeSignLog; +use App\Models\EmployeeSignRepair; use Carbon\Carbon; class EmployeeSignService extends BaseService @@ -31,7 +37,7 @@ class EmployeeSignService extends BaseService /** * 整理昨天的打卡流水, 生成对应的打卡记录 */ - public function signResult(Carbon $date = null) + public function signResult(?Carbon $date = null) { $date = $date ?: now()->subDay(); $start = $date->copy()->startOfDay(); @@ -92,11 +98,11 @@ class EmployeeSignService extends BaseService /** * 打卡 * - * @param Employee $user 用户 - * @param SignTime $time 上班/下班 打卡 - * @param mixed $date 打卡时间 - * @param array $options {type: 正常/外勤 打卡, remarks: 备注, position: 位置} - * @return boolean + * @param Employee $user 用户 + * @param SignTime $time 上班/下班 打卡 + * @param mixed $date 打卡时间 + * @param array $options {type: 正常/外勤 打卡, remarks: 备注, position: 位置} + * @return bool */ public function signDay(Employee $user, SignTime $time, $date = '', array $options = []) { @@ -123,7 +129,7 @@ class EmployeeSignService extends BaseService $sign->sign_type = $log->sign_type; if ($time == SignTime::Morning) { $sign->first_time = $log->time; - } else if ($time == SignTime::Afternoon) { + } elseif ($time == SignTime::Afternoon) { $sign->last_time = $log->time; } $sign->sign_status = SignStatus::Lose; @@ -143,6 +149,7 @@ class EmployeeSignService extends BaseService public function hasRest(Employee $user, $date = '') { $date = $date ?: now(); + return EmployeeRest::where('employee_id', $user->id)->where('date', $date)->exists(); } @@ -165,8 +172,8 @@ class EmployeeSignService extends BaseService $dlat = $lat2 - $lat1; // Calculate the Haversine formula - $a = pow(sin($dlat/2), 2) + cos($lat1) * cos($lat2) * pow(sin($dlon/2), 2); - $c = 2 * atan2(sqrt($a), sqrt(1-$a)); + $a = pow(sin($dlat / 2), 2) + cos($lat1) * cos($lat2) * pow(sin($dlon / 2), 2); + $c = 2 * atan2(sqrt($a), sqrt(1 - $a)); $distance = $R * $c; return floor($distance * 1000); diff --git a/app/Admin/Services/HolidayApplyService.php b/app/Admin/Services/HolidayApplyService.php index 51d8716..ac40c34 100644 --- a/app/Admin/Services/HolidayApplyService.php +++ b/app/Admin/Services/HolidayApplyService.php @@ -3,11 +3,12 @@ namespace App\Admin\Services; use App\Admin\Filters\HolidayApplyFilter; -use App\Models\{HolidayApply, Employee}; +use App\Enums\CheckStatus; +use App\Models\Employee; +use App\Models\HolidayApply; use Carbon\Carbon; use Illuminate\Support\Facades\Validator; use Slowlyo\OwlAdmin\Admin; -use App\Enums\CheckStatus; class HolidayApplyService extends BaseService { @@ -30,7 +31,7 @@ class HolidayApplyService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -45,7 +46,7 @@ class HolidayApplyService extends BaseService if ($user->can('admin.hr.holiday.view')) { array_push($actions, 'view'); } - if ($user->can('admin.hr.holiday.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.hr.holiday.delete') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'delete'); } if (in_array($model->workflow->check_status, [CheckStatus::None, CheckStatus::Cancel, CheckStatus::Fail])) { @@ -96,7 +97,7 @@ class HolidayApplyService extends BaseService public function update($primaryKey, $data): bool { $model = $this->query()->whereKey($primaryKey)->firstOrFail(); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { return $this->setError('审核中, 无法修改'); } $data = $this->resloveData($data, $model); @@ -109,6 +110,7 @@ class HolidayApplyService extends BaseService $model->update($data); $this->currentModel = $model; + return true; } @@ -118,6 +120,7 @@ class HolidayApplyService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/OfficalBusinessService.php b/app/Admin/Services/OfficalBusinessService.php index 4df7b69..8295376 100644 --- a/app/Admin/Services/OfficalBusinessService.php +++ b/app/Admin/Services/OfficalBusinessService.php @@ -3,11 +3,12 @@ namespace App\Admin\Services; use App\Admin\Filters\OfficalBusinessFilter; -use App\Models\{Employee, OfficalBusiness}; +use App\Enums\CheckStatus; +use App\Models\Employee; +use App\Models\OfficalBusiness; use Carbon\Carbon; use Illuminate\Support\Facades\Validator; use Slowlyo\OwlAdmin\Admin; -use App\Enums\CheckStatus; class OfficalBusinessService extends BaseService { @@ -30,7 +31,7 @@ class OfficalBusinessService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -45,7 +46,7 @@ class OfficalBusinessService extends BaseService if ($user->can('admin.hr.business.view')) { array_push($actions, 'view'); } - if ($user->can('admin.hr.business.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.hr.business.delete') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'delete'); } if (in_array($model->workflow->check_status, [CheckStatus::None, CheckStatus::Cancel, CheckStatus::Fail])) { @@ -96,7 +97,7 @@ class OfficalBusinessService extends BaseService public function update($primaryKey, $data): bool { $model = $this->query()->whereKey($primaryKey)->firstOrFail(); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { return $this->setError('审核中, 无法修改'); } $data = $this->resloveData($data, $model); @@ -109,6 +110,7 @@ class OfficalBusinessService extends BaseService $model->update($data); $this->currentModel = $model; + return true; } @@ -118,6 +120,7 @@ class OfficalBusinessService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/OvertimeApplyService.php b/app/Admin/Services/OvertimeApplyService.php index 1cf70c8..82d4b48 100644 --- a/app/Admin/Services/OvertimeApplyService.php +++ b/app/Admin/Services/OvertimeApplyService.php @@ -3,11 +3,12 @@ namespace App\Admin\Services; use App\Admin\Filters\OvertimeApplyFilter; -use App\Models\{Employee, OvertimeApply}; +use App\Enums\CheckStatus; +use App\Models\Employee; +use App\Models\OvertimeApply; use Carbon\Carbon; use Illuminate\Support\Facades\Validator; use Slowlyo\OwlAdmin\Admin; -use App\Enums\CheckStatus; class OvertimeApplyService extends BaseService { @@ -30,7 +31,7 @@ class OvertimeApplyService extends BaseService $total = $list->total(); } $user = Admin::user(); - foreach($items as &$item) { + foreach ($items as &$item) { $item->row_actions = $this->rowActions($user, $item); } @@ -45,7 +46,7 @@ class OvertimeApplyService extends BaseService if ($user->can('admin.hr.overtime.view')) { array_push($actions, 'view'); } - if ($user->can('admin.hr.overtime.delete') && !in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { + if ($user->can('admin.hr.overtime.delete') && ! in_array($model->workflow->check_status, [CheckStatus::Processing, CheckStatus::Success])) { array_push($actions, 'delete'); } if (in_array($model->workflow->check_status, [CheckStatus::None, CheckStatus::Cancel, CheckStatus::Fail])) { @@ -108,7 +109,7 @@ class OvertimeApplyService extends BaseService public function update($primaryKey, $data): bool { $model = $this->query()->whereKey($primaryKey)->firstOrFail(); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { return $this->setError('审核中, 无法修改'); } $data = $this->resloveData($data, $model); @@ -128,6 +129,7 @@ class OvertimeApplyService extends BaseService foreach ($list as $item) { $item->delete(); } + return true; } } diff --git a/app/Admin/Services/Plan/PlanService.php b/app/Admin/Services/Plan/PlanService.php index 6dd1db3..b751cbe 100644 --- a/app/Admin/Services/Plan/PlanService.php +++ b/app/Admin/Services/Plan/PlanService.php @@ -79,7 +79,7 @@ class PlanService extends BaseService break; - // 业绩指标 + // 业绩指标 case PlanPerformance::class: $payload = $data['plan_performance'] ?? []; @@ -206,7 +206,7 @@ class PlanService extends BaseService } break; - // 业绩指标 + // 业绩指标 case PlanPerformance::class: // 任务开始时间 $startAt = Carbon::createFromFormat('Y-m-d H:i:s', "{$plan->planable->month}-01 00:00:00"); @@ -220,6 +220,7 @@ class PlanService extends BaseService /** @var \Illuminate\Support\Collection */ $ids = Keyword::where('path', 'like', "%-{$parent->id}-%")->pluck('key'); } + return $ids->push($id); }, $plan->planable->store_category_id); @@ -280,6 +281,7 @@ class PlanService extends BaseService ); } } + return $plan; } diff --git a/app/Admin/Services/Plan/TaskService.php b/app/Admin/Services/Plan/TaskService.php index df19c4a..81c327c 100644 --- a/app/Admin/Services/Plan/TaskService.php +++ b/app/Admin/Services/Plan/TaskService.php @@ -111,7 +111,7 @@ class TaskService extends BaseService break; - // 清洁卫生 + // 清洁卫生 case PlanHygiene::class: $payload = $data['task_hygiene'] ?? []; diff --git a/app/Admin/Services/StoreService.php b/app/Admin/Services/StoreService.php index 62e3c2e..bfdc9dc 100644 --- a/app/Admin/Services/StoreService.php +++ b/app/Admin/Services/StoreService.php @@ -45,7 +45,7 @@ class StoreService extends BaseService StoreProfitRatioLog::create([ 'store_id' => $model->id, 'employee_id' => $employee->id, - 'before' => $beforeProfitRatio , + 'before' => $beforeProfitRatio, 'after' => $afterProfitRatio, ]); } @@ -68,7 +68,7 @@ class StoreService extends BaseService return false; } - + $beforeProfitRatio = $model->profit_ratio; $model->update($data); @@ -90,7 +90,7 @@ class StoreService extends BaseService StoreProfitRatioLog::create([ 'store_id' => $model->id, 'employee_id' => $employee->id, - 'before' => $beforeProfitRatio , + 'before' => $beforeProfitRatio, 'after' => $afterProfitRatio, ]); } diff --git a/app/Admin/Services/Train/BookService.php b/app/Admin/Services/Train/BookService.php index 0ef52de..ef22d30 100644 --- a/app/Admin/Services/Train/BookService.php +++ b/app/Admin/Services/Train/BookService.php @@ -3,10 +3,11 @@ namespace App\Admin\Services\Train; use App\Admin\Filters\TrianBookFilter; -use App\Models\Train\Book; use App\Admin\Services\BaseService; +use App\Models\Train\Book; +use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\Validator; use Illuminate\Support\Str; -use Illuminate\Support\Facades\{Validator, Storage}; class BookService extends BaseService { @@ -30,12 +31,13 @@ class BookService extends BaseService 'files' => ['nullable', 'array'], ]; $updateRules = [ - 'files' => ['nullable','array'], + 'files' => ['nullable', 'array'], ]; $validator = Validator::make($data, $model ? $updateRules : $createRules); if ($validator->fails()) { return $validator->errors()->first(); } + return true; } } diff --git a/app/Admin/Services/Train/ExaminationService.php b/app/Admin/Services/Train/ExaminationService.php index bed63f8..9f82f42 100644 --- a/app/Admin/Services/Train/ExaminationService.php +++ b/app/Admin/Services/Train/ExaminationService.php @@ -3,13 +3,12 @@ namespace App\Admin\Services\Train; use App\Admin\Filters\TrainExaminationFilter; -use App\Models\Train\{Examination, Question}; use App\Admin\Services\BaseService; -use Illuminate\Support\Str; -use Illuminate\Support\Facades\{Validator, Storage}; use App\Enums\ExamStatus; use App\Enums\MessageType; use App\Models\Employee; +use App\Models\Train\Examination; +use App\Models\Train\Question; use App\Services\MessageService; class ExaminationService extends BaseService @@ -30,7 +29,7 @@ class ExaminationService extends BaseService $model->min_mark = $model->papers->whereNotNull('finished_at')->min('mark'); $model->max_mark = $model->papers->whereNotNull('finished_at')->max('mark'); $model->avg_mark = floor($model->papers->whereNotNull('finished_at')->avg('mark') * 100) / 100; - $model->total_finished = $model->papers->whereNotNull('finished_at')->count() . '/'.$model->papers->count(); + $model->total_finished = $model->papers->whereNotNull('finished_at')->count().'/'.$model->papers->count(); return $model; } @@ -59,13 +58,14 @@ class ExaminationService extends BaseService array_push($questions, $item); $totalQuestions++; - $totalScore+=$item['score']; + $totalScore += $item['score']; } } $data['questions'] = $questions; $data['total_questions'] = $totalQuestions; $data['total_score'] = $totalScore; } + return $data; } @@ -76,9 +76,10 @@ class ExaminationService extends BaseService } $questions = []; - foreach($examination->questions as $question) { + foreach ($examination->questions as $question) { $question['options'] = array_map(function ($option) { $option['selected'] = false; + return $option; }, $question['options']); array_push($questions, $question); diff --git a/app/Admin/Services/Train/PaperService.php b/app/Admin/Services/Train/PaperService.php index a9be23d..1985841 100644 --- a/app/Admin/Services/Train/PaperService.php +++ b/app/Admin/Services/Train/PaperService.php @@ -3,10 +3,8 @@ namespace App\Admin\Services\Train; use App\Admin\Filters\TrianPaperFilter; -use App\Models\Train\Paper; use App\Admin\Services\BaseService; -use Illuminate\Support\Str; -use Illuminate\Support\Facades\{Validator, Storage}; +use App\Models\Train\Paper; class PaperService extends BaseService { @@ -18,10 +16,9 @@ class PaperService extends BaseService /** * 答题 - * - * @param Paper $paper - * @param array $answers [[0, 1], [1], [2, 3]] - * @return boolean + * + * @param array $answers [[0, 1], [1], [2, 3]] + * @return bool */ public function answer(Paper $paper, array $answers) { @@ -36,7 +33,7 @@ class PaperService extends BaseService $score = $item['score']; foreach ($item['options'] as $subIndex => $option) { $option['selected'] = in_array($subIndex, $item['user_answer']); - if ((!$option['is_true'] && $option['selected']) || ($option['is_true'] && !$option['selected'])) { + if ((! $option['is_true'] && $option['selected']) || ($option['is_true'] && ! $option['selected'])) { $score = 0; } array_push($options, $option); @@ -52,5 +49,4 @@ class PaperService extends BaseService return true; } - -} \ No newline at end of file +} diff --git a/app/Admin/Services/Train/QuestionService.php b/app/Admin/Services/Train/QuestionService.php index 0fe9b89..5287309 100644 --- a/app/Admin/Services/Train/QuestionService.php +++ b/app/Admin/Services/Train/QuestionService.php @@ -3,10 +3,8 @@ namespace App\Admin\Services\Train; use App\Admin\Filters\TrianQuestionFilter; -use App\Models\Train\Question; use App\Admin\Services\BaseService; -use Illuminate\Support\Str; -use Illuminate\Support\Facades\{Validator, Storage}; +use App\Models\Train\Question; class QuestionService extends BaseService { @@ -20,12 +18,13 @@ class QuestionService extends BaseService { if (isset($data['options']) && $data['options']) { $options = []; - foreach($data['options'] as $key => $item) { + foreach ($data['options'] as $key => $item) { $item['is_true'] = data_get($item, 'is_true', false); array_push($options, $item); } $data['options'] = $options; } + return $data; } } diff --git a/app/Admin/Services/WorkFlowService.php b/app/Admin/Services/WorkFlowService.php index 8ca1fb1..615f028 100644 --- a/app/Admin/Services/WorkFlowService.php +++ b/app/Admin/Services/WorkFlowService.php @@ -2,7 +2,8 @@ namespace App\Admin\Services; -use App\Enums\{CheckStatus, CheckType}; +use App\Enums\CheckStatus; +use App\Enums\CheckType; use App\Events\WorkflowCheckFailed; use App\Events\WorkflowCheckNext; use App\Events\WorkflowCheckSuccess; @@ -30,7 +31,6 @@ class WorkFlowService extends BaseService * * @param WorkflowCheck $check 待审核记录 * @param Employee $user 申请人 - * * @return bool true: 成功, false: 失败, $this->getError(): 错误消息 */ public function apply(WorkflowCheck $check, Employee $user) @@ -225,8 +225,8 @@ class WorkFlowService extends BaseService } $checkValue = [$user->id]; if ($user->jobs && $user->jobs->count() > 0) { - foreach($user->jobs as $item) { - array_push($checkValue, $user->store_id . '-' . $item->key); + foreach ($user->jobs as $item) { + array_push($checkValue, $user->store_id.'-'.$item->key); } } @@ -241,8 +241,8 @@ class WorkFlowService extends BaseService $data['config'] = null; break; } - if (!isset($item['value'])) { - $item['value'] = match($item['type']) { + if (! isset($item['value'])) { + $item['value'] = match ($item['type']) { CheckType::Job->value => $item['job'], CheckType::User->value => $item['user'], }; diff --git a/app/Console/Commands/EmployeeSign.php b/app/Console/Commands/EmployeeSign.php index 10c07b2..c22ec34 100644 --- a/app/Console/Commands/EmployeeSign.php +++ b/app/Console/Commands/EmployeeSign.php @@ -3,9 +3,9 @@ namespace App\Console\Commands; use App\Admin\Services\EmployeeSignService; +use Carbon\Carbon; use Illuminate\Console\Command; use Illuminate\Support\Facades\DB; -use Carbon\Carbon; class EmployeeSign extends Command { diff --git a/app/Console/Commands/TaskLedgerGenerateCommand.php b/app/Console/Commands/TaskLedgerGenerateCommand.php index 7c82a6d..9645a36 100644 --- a/app/Console/Commands/TaskLedgerGenerateCommand.php +++ b/app/Console/Commands/TaskLedgerGenerateCommand.php @@ -49,7 +49,7 @@ class TaskLedgerGenerateCommand extends Command } /** @var \App\Models\PlanLedger */ - $planable = DB::transaction(function () use ($datetime, $stores) { + $planable = DB::transaction(function () use ($datetime) { /** @var \App\Models\PlanLedger */ $planable = PlanLedger::firstOrNew([ 'date' => $datetime->format('Y-m-d'), diff --git a/app/Console/Commands/TaskUpdateCommand.php b/app/Console/Commands/TaskUpdateCommand.php index b9145d5..fb12cab 100644 --- a/app/Console/Commands/TaskUpdateCommand.php +++ b/app/Console/Commands/TaskUpdateCommand.php @@ -40,12 +40,12 @@ class TaskUpdateCommand extends Command $datetime = now(); Task::with(['taskable' => function (MorphTo $morphTo) { - $morphTo->morphWith([ - TaskLedger::class, - TaskPerformance::class, - TaskHygiene::class => ['workflow'], - ]); - }]) + $morphTo->morphWith([ + TaskLedger::class, + TaskPerformance::class, + TaskHygiene::class => ['workflow'], + ]); + }]) ->where('task_status', TaskStatus::Pending) ->where('end_at', '<', $datetime) ->lazyById() diff --git a/app/Enums/CheckStatus.php b/app/Enums/CheckStatus.php index 888dc49..e59f4a1 100644 --- a/app/Enums/CheckStatus.php +++ b/app/Enums/CheckStatus.php @@ -46,8 +46,9 @@ enum CheckStatus: int self::Success->value => '已通过', self::Fail->value => '未通过', // self::Cancel->value => '已取消', - ] + ], ]; + return data_get($maps, $index); } diff --git a/app/Events/WorkflowCheckFailed.php b/app/Events/WorkflowCheckFailed.php index 60aa66b..99ec818 100644 --- a/app/Events/WorkflowCheckFailed.php +++ b/app/Events/WorkflowCheckFailed.php @@ -15,6 +15,7 @@ class WorkflowCheckFailed implements ShouldDispatchAfterCommit * Create a new event instance. */ public function __construct( - public WorkflowCheck $workflowCheck - ) {} + public WorkflowCheck $workflowCheck + ) { + } } diff --git a/app/Events/WorkflowCheckNext.php b/app/Events/WorkflowCheckNext.php index 6892fb1..e39509f 100644 --- a/app/Events/WorkflowCheckNext.php +++ b/app/Events/WorkflowCheckNext.php @@ -15,6 +15,7 @@ class WorkflowCheckNext implements ShouldDispatchAfterCommit * Create a new event instance. */ public function __construct( - public WorkflowLog $workflowLog, - ) {} + public WorkflowLog $workflowLog, + ) { + } } diff --git a/app/Events/WorkflowCheckSuccess.php b/app/Events/WorkflowCheckSuccess.php index 53e2640..f5945f7 100644 --- a/app/Events/WorkflowCheckSuccess.php +++ b/app/Events/WorkflowCheckSuccess.php @@ -15,6 +15,7 @@ class WorkflowCheckSuccess implements ShouldDispatchAfterCommit * Create a new event instance. */ public function __construct( - public WorkflowCheck $workflowCheck - ) {} + public WorkflowCheck $workflowCheck + ) { + } } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index d3c64fc..113232b 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -5,13 +5,13 @@ namespace App\Exceptions; use Illuminate\Auth\AuthenticationException; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; -use Illuminate\Http\{Request, Response}; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Validation\ValidationException; use Overtrue\EasySms\Exceptions\NoGatewayAvailableException; use Slowlyo\OwlAdmin\Exceptions\AdminException; use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Throwable; class Handler extends ExceptionHandler { @@ -60,6 +60,7 @@ class Handler extends ExceptionHandler foreach ($e->getExceptions() as $exception) { $this->report($exception); } + return false; }); } diff --git a/app/Http/Controllers/Api/Account/StorePerformanceController.php b/app/Http/Controllers/Api/Account/StorePerformanceController.php index e609602..dfac374 100644 --- a/app/Http/Controllers/Api/Account/StorePerformanceController.php +++ b/app/Http/Controllers/Api/Account/StorePerformanceController.php @@ -29,6 +29,7 @@ class StorePerformanceController extends Controller /** * 当月的业绩指标任务 + * * @var \App\Models\TaskPerformance */ $taskPerformance = TaskPerformance::where('store_id', $user->store_id) diff --git a/app/Http/Controllers/Api/AgreementController.php b/app/Http/Controllers/Api/AgreementController.php index 5a66bf1..2e046ef 100644 --- a/app/Http/Controllers/Api/AgreementController.php +++ b/app/Http/Controllers/Api/AgreementController.php @@ -2,7 +2,8 @@ namespace App\Http\Controllers\Api; -use App\Admin\Services\{AgreementService, WorkFlowService}; +use App\Admin\Services\AgreementService; +use App\Admin\Services\WorkFlowService; use App\Exceptions\RuntimeException; use App\Http\Resources\AgreementResource; use App\Models\Agreement; @@ -43,16 +44,17 @@ class AgreementController extends Controller try { DB::beginTransaction(); - if (!$service->store($data)) { + if (! $service->store($data)) { throw new RuntimeException($result); } $model = $service->getCurrentModel(); $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -67,15 +69,16 @@ class AgreementController extends Controller try { DB::beginTransaction(); - if (!$service->update($id, $request->all())) { + if (! $service->update($id, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -90,11 +93,12 @@ class AgreementController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Auth/UserController.php b/app/Http/Controllers/Api/Auth/UserController.php index 3978d65..1264203 100644 --- a/app/Http/Controllers/Api/Auth/UserController.php +++ b/app/Http/Controllers/Api/Auth/UserController.php @@ -3,17 +3,17 @@ namespace App\Http\Controllers\Api\Auth; use App\Admin\Services\EmployeeService; -use App\Enums\{UserRole, BusinessStatus}; +use App\Enums\BusinessStatus; +use App\Enums\UserRole; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; use App\Http\Resources\KeywordResource; use App\Http\Resources\StoreResource; use App\Models\Message; -use App\Models\{Employee, Store, AdminUser}; -use Illuminate\Http\{Request, Response}; +use App\Models\Store; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Facades\Hash; -use Illuminate\Validation\ValidationException; /** * 个人中心 @@ -41,6 +41,7 @@ class UserController extends Controller 'role' => $user->userRole(), ]; } + // 修改账户信息 public function update(Request $request) { @@ -49,7 +50,7 @@ class UserController extends Controller DB::beginTransaction(); $service = EmployeeService::make(); $data = $request->only(['name', 'avatar', 'password', 'confirm_password', 'phone']); - if (!$service->update($user->id, $data)) { + if (! $service->update($user->id, $data)) { throw new RuntimeException($service->getError()); } DB::commit(); @@ -57,6 +58,7 @@ class UserController extends Controller DB::rollback(); throw new RuntimeException($e->getMessage()); } + return response('', Response::HTTP_OK); } @@ -69,9 +71,9 @@ class UserController extends Controller $query = Store::filter($request->all())->where('business_status', BusinessStatus::Open); if (in_array(UserRole::Admin, $role)) { $list = $query->get(); - } else if (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) { + } elseif (in_array(UserRole::StoreUser, $role) || in_array(UserRole::Store, $role)) { $list = [$query->findOrFail($user->store_id)]; - } + } return StoreResource::collection($list); } diff --git a/app/Http/Controllers/Api/FileUploadController.php b/app/Http/Controllers/Api/FileUploadController.php index c33250d..10c9856 100644 --- a/app/Http/Controllers/Api/FileUploadController.php +++ b/app/Http/Controllers/Api/FileUploadController.php @@ -28,7 +28,7 @@ class FileUploadController extends Controller ], ); - /** @var \Illuminate\Http\UploadedFile */ + /** @var \Illuminate\Http\UploadedFile */ $file = $request->file('file'); if ($path = $file->storeAs(date('Ymd'), $this->filename($file))) { diff --git a/app/Http/Controllers/Api/Hr/EmployeeController.php b/app/Http/Controllers/Api/Hr/EmployeeController.php index 59e48ca..072aa7b 100644 --- a/app/Http/Controllers/Api/Hr/EmployeeController.php +++ b/app/Http/Controllers/Api/Hr/EmployeeController.php @@ -2,15 +2,16 @@ namespace App\Http\Controllers\Api\Hr; -use App\Http\Controllers\Api\Controller; -use App\Models\{Employee, Store, AdminUser}; -use Illuminate\Http\{Request, Response}; -use App\Enums\UserRole; -use App\Http\Resources\EmployeeResource; use App\Admin\Services\EmployeeService; -use App\Exceptions\RuntimeException; -use Illuminate\Support\Facades\DB; use App\Enums\EmployeeStatus; +use App\Enums\UserRole; +use App\Exceptions\RuntimeException; +use App\Http\Controllers\Api\Controller; +use App\Http\Resources\EmployeeResource; +use App\Models\Employee; +use Illuminate\Http\Request; +use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; /** * 员工管理 @@ -24,7 +25,7 @@ class EmployeeController extends Controller $filter = $request->all(); $query = Employee::with(['jobs', 'store', 'adminUser'])->filter($filter)->enable(); - if (!in_array(UserRole::Admin, $role)) { + if (! in_array(UserRole::Admin, $role)) { $query->whereIn('store_id', [$user->store_id]); } $list = $query->orderBy('id', 'desc')->paginate($request->input('per_page')); @@ -45,7 +46,7 @@ class EmployeeController extends Controller DB::beginTransaction(); $service = EmployeeService::make(); $data = $request->all(); - if (!$service->store($data)) { + if (! $service->store($data)) { throw new RuntimeException($service->getError()); } DB::commit(); @@ -53,6 +54,7 @@ class EmployeeController extends Controller DB::rollback(); throw new RuntimeException($e->getMessage()); } + return response('', Response::HTTP_CREATED); } @@ -62,7 +64,7 @@ class EmployeeController extends Controller DB::beginTransaction(); $service = EmployeeService::make(); $data = $request->only(['name', 'avatar', 'password', 'confirm_password', 'phone', 'store_id']); - if (!$service->update($id, $data)) { + if (! $service->update($id, $data)) { throw new RuntimeException($service->getError()); } DB::commit(); @@ -70,6 +72,7 @@ class EmployeeController extends Controller DB::rollback(); throw new RuntimeException($e->getMessage()); } + return response('', Response::HTTP_OK); } @@ -78,7 +81,7 @@ class EmployeeController extends Controller try { DB::beginTransaction(); $service = EmployeeService::make(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); @@ -86,6 +89,7 @@ class EmployeeController extends Controller DB::rollback(); throw new RuntimeException($e->getMessage()); } + return response('', Response::HTTP_OK); } @@ -98,7 +102,7 @@ class EmployeeController extends Controller throw new RuntimeException('未入职'); } $service = EmployeeService::make(); - if (!$service->leave($info)) { + if (! $service->leave($info)) { throw new RuntimeException($service->getError()); } DB::commit(); @@ -106,6 +110,7 @@ class EmployeeController extends Controller DB::rollback(); throw new RuntimeException($e->getMessage()); } + return response('', Response::HTTP_OK); } } diff --git a/app/Http/Controllers/Api/Hr/HolidayController.php b/app/Http/Controllers/Api/Hr/HolidayController.php index 20e57de..840207c 100644 --- a/app/Http/Controllers/Api/Hr/HolidayController.php +++ b/app/Http/Controllers/Api/Hr/HolidayController.php @@ -2,7 +2,8 @@ namespace App\Http\Controllers\Api\Hr; -use App\Admin\Services\{HolidayApplyService, WorkFlowService}; +use App\Admin\Services\HolidayApplyService; +use App\Admin\Services\WorkFlowService; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; use App\Http\Resources\HolidayApplyResource; @@ -52,11 +53,12 @@ class HolidayController extends Controller } $model = HolidayApply::create($data); $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -71,15 +73,16 @@ class HolidayController extends Controller try { DB::beginTransaction(); - if (!$service->update($id, $request->all())) { + if (! $service->update($id, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -94,11 +97,12 @@ class HolidayController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Hr/OfficalBusinessController.php b/app/Http/Controllers/Api/Hr/OfficalBusinessController.php index 4c80827..6b34ae0 100644 --- a/app/Http/Controllers/Api/Hr/OfficalBusinessController.php +++ b/app/Http/Controllers/Api/Hr/OfficalBusinessController.php @@ -2,7 +2,8 @@ namespace App\Http\Controllers\Api\Hr; -use App\Admin\Services\{OfficalBusinessService, WorkFlowService}; +use App\Admin\Services\OfficalBusinessService; +use App\Admin\Services\WorkFlowService; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; use App\Http\Resources\OfficalBusinessResource; @@ -44,16 +45,17 @@ class OfficalBusinessController extends Controller try { DB::beginTransaction(); - if (!$service->store($data)) { + if (! $service->store($data)) { throw new RuntimeException($service->getError()); } $model = $service->getCurrentModel(); $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -68,15 +70,16 @@ class OfficalBusinessController extends Controller try { DB::beginTransaction(); - if (!$service->update($id, $request->all())) { + if (! $service->update($id, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -91,11 +94,12 @@ class OfficalBusinessController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Hr/OvertimeController.php b/app/Http/Controllers/Api/Hr/OvertimeController.php index 8c0738d..2e7ad96 100644 --- a/app/Http/Controllers/Api/Hr/OvertimeController.php +++ b/app/Http/Controllers/Api/Hr/OvertimeController.php @@ -2,7 +2,8 @@ namespace App\Http\Controllers\Api\Hr; -use App\Admin\Services\{OvertimeApplyService, WorkFlowService}; +use App\Admin\Services\OvertimeApplyService; +use App\Admin\Services\WorkFlowService; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; use App\Http\Resources\OvertimeApplyResource; @@ -59,16 +60,17 @@ class OvertimeController extends Controller try { DB::beginTransaction(); - if (!$service->store($data)) { + if (! $service->store($data)) { throw new RuntimeException($service->getError()); } $model = $service->getCurrentModel(); $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -98,15 +100,16 @@ class OvertimeController extends Controller try { DB::beginTransaction(); - if (!$service->update($id, $request->all())) { + if (! $service->update($id, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -121,11 +124,12 @@ class OvertimeController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Hr/PromotionController.php b/app/Http/Controllers/Api/Hr/PromotionController.php index 94f128a..f85535d 100644 --- a/app/Http/Controllers/Api/Hr/PromotionController.php +++ b/app/Http/Controllers/Api/Hr/PromotionController.php @@ -2,7 +2,8 @@ namespace App\Http\Controllers\Api\Hr; -use App\Admin\Services\{EmployeePromotionService, WorkFlowService}; +use App\Admin\Services\EmployeePromotionService; +use App\Admin\Services\WorkFlowService; use App\Enums\PromotionStatus; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; @@ -51,6 +52,7 @@ class PromotionController extends Controller public function show($id) { $info = EmployeePromotion::with(['workflow', 'employee', 'invitor', 'job'])->findOrFail($id); + return EmployeePromotionResource::make($info); } @@ -62,7 +64,7 @@ class PromotionController extends Controller $user = $this->guard()->user(); $info = EmployeePromotion::where('employee_id', $user->id)->findOrFail($id); - if (!$service->apply($info, $request->all())) { + if (! $service->apply($info, $request->all())) { throw new RuntimeException($service->getError()); } @@ -79,15 +81,16 @@ class PromotionController extends Controller try { DB::beginTransaction(); - if (!$service->invitor($model, $request->all())) { + if (! $service->invitor($model, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $model->employee)) { + if (! $workflow->apply($model->workflow, $model->employee)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -104,17 +107,17 @@ class PromotionController extends Controller DB::beginTransaction(); // 申请人完善资料 if ($info->promotion_status == PromotionStatus::Employee) { - if (!$service->apply($info, $request->only(['age', 'sex', 'education', 'first_work_time', 'work_years', 'work_years_in_company', 'comment_self', 'plans', 'reason']))) { + if (! $service->apply($info, $request->only(['age', 'sex', 'education', 'first_work_time', 'work_years', 'work_years_in_company', 'comment_self', 'plans', 'reason']))) { throw new RuntimeException($service->getError()); } } // 推荐人填写 - else if ($info->promotion_status == PromotionStatus::Invitor) { - if (!$service->invitor($info, $request->only(['reason']))) { + elseif ($info->promotion_status == PromotionStatus::Invitor) { + if (! $service->invitor($info, $request->only(['reason']))) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($info->workflow, $info->employee)) { + if (! $workflow->apply($info->workflow, $info->employee)) { throw new RuntimeException($workflow->getError()); } } else { @@ -122,6 +125,7 @@ class PromotionController extends Controller } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); @@ -136,11 +140,12 @@ class PromotionController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response()->noContent(); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Hr/SignController.php b/app/Http/Controllers/Api/Hr/SignController.php index 21a55e1..b54aff9 100644 --- a/app/Http/Controllers/Api/Hr/SignController.php +++ b/app/Http/Controllers/Api/Hr/SignController.php @@ -2,16 +2,19 @@ namespace App\Http\Controllers\Api\Hr; -use App\Http\Controllers\Api\Controller; -use App\Models\{EmployeeSign, EmployeeSignLog}; -use Illuminate\Http\{Request, Response}; -use App\Exceptions\RuntimeException; -use Illuminate\Support\Facades\DB; use App\Admin\Services\EmployeeSignService; -use App\Enums\{SignTime, SignType, SignStatus}; +use App\Enums\SignTime; +use App\Enums\SignType; +use App\Exceptions\RuntimeException; +use App\Http\Controllers\Api\Controller; +use App\Models\EmployeeSign; +use App\Models\EmployeeSignLog; use Carbon\Carbon; -use Slowlyo\OwlAdmin\Services\AdminSettingService; +use Illuminate\Http\Request; +use Illuminate\Http\Response; +use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; +use Slowlyo\OwlAdmin\Services\AdminSettingService; /** * 考勤打卡 @@ -27,7 +30,7 @@ class SignController extends Controller $start = $time->copy()->startOfMonth(); $end = $time->copy()->endOfMonth(); do { - $info = $list->where(fn($item) => $item->date->format('Y-m-d') == $start->format('Y-m-d'))->first(); + $info = $list->where(fn ($item) => $item->date->format('Y-m-d') == $start->format('Y-m-d'))->first(); array_push($data, [ 'date' => $start->format('Y-m-d'), 'sign_status' => $info ? $info->sign_status : null, @@ -35,7 +38,7 @@ class SignController extends Controller 'last_time' => $info && $info->last_time ? $info->last_time->format('H:i') : '', ]); $start->addDay(); - } while(!$end->isSameDay($start)); + } while (! $end->isSameDay($start)); return $data; } @@ -44,7 +47,7 @@ class SignController extends Controller { $user = $this->guard()->user(); $store = $user->store; - if (!$store) { + if (! $store) { throw new RuntimeException('没有绑定门店'); } $date = now(); @@ -102,7 +105,7 @@ class SignController extends Controller $data = array_merge($data, [ 'enable' => true, 'distance' => $distance, - 'description' => '已进入考勤范围: ' . $store->title, + 'description' => '已进入考勤范围: '.$store->title, ]); } } @@ -119,14 +122,14 @@ class SignController extends Controller 'position.lon' => ['required'], 'position.lat' => ['required'], ], [ - 'type.required' => __('employee_sign_log.sign_type') . '必填', - 'time.required' => __('employee_sign_log.sign_time') . '必填', - 'position.required' => __('employee_sign_log.position') . '必填', - 'position.*.required' => __('employee_sign_log.position') . '必填', + 'type.required' => __('employee_sign_log.sign_type').'必填', + 'time.required' => __('employee_sign_log.sign_time').'必填', + 'position.required' => __('employee_sign_log.position').'必填', + 'position.*.required' => __('employee_sign_log.position').'必填', ]); $user = $this->guard()->user(); $store = $user->store; - if (!$store) { + if (! $store) { throw new RuntimeException('没有绑定门店'); } $time = SignTime::from($request->input('time')); @@ -159,10 +162,11 @@ class SignController extends Controller try { DB::beginTransaction(); - if (!$service->signDay($user, $time, now(), $request->only(['remarks', 'position', 'type']))) { + if (! $service->signDay($user, $time, now(), $request->only(['remarks', 'position', 'type']))) { throw new RuntimeException($service->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/Hr/SignRepairController.php b/app/Http/Controllers/Api/Hr/SignRepairController.php index 90ebcc6..68fadd7 100644 --- a/app/Http/Controllers/Api/Hr/SignRepairController.php +++ b/app/Http/Controllers/Api/Hr/SignRepairController.php @@ -2,14 +2,16 @@ namespace App\Http\Controllers\Api\Hr; -use App\Admin\Services\{EmployeeSignRepairService, WorkFlowService}; +use App\Admin\Services\EmployeeSignRepairService; +use App\Admin\Services\WorkFlowService; use App\Enums\{CheckStatus}; use App\Exceptions\RuntimeException; use App\Http\Controllers\Api\Controller; -use App\Http\Resources\{EmployeeSignRepairResource, WorkflowLogResource}; +use App\Http\Resources\EmployeeSignRepairResource; use App\Models\EmployeeSignRepair; use App\Models\WorkflowCheck; -use Illuminate\Http\{Request, Response}; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; /** @@ -26,6 +28,7 @@ class SignRepairController extends Controller ->orderByDesc(WorkflowCheck::checkStatusSortBuilder(new EmployeeSignRepair())) ->orderBy('id', 'desc') ->paginate($request->input('per_page')); + return EmployeeSignRepairResource::collection($list); } @@ -37,16 +40,17 @@ class SignRepairController extends Controller try { DB::beginTransaction(); - if (!$service->store($data)) { + if (! $service->store($data)) { throw new RuntimeException($service->getError()); } $model = $service->getCurrentModel(); $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); @@ -65,21 +69,22 @@ class SignRepairController extends Controller { $user = $this->guard()->user(); $model = EmployeeSignRepair::with(['workflow'])->where('employee_id', $user->id)->findOrFail($id); - if (!$model->canUpdate()) { + if (! $model->canUpdate()) { throw new RuntimeException('审核中, 无法修改'); } try { DB::beginTransaction(); - if (!$service->update($id, $request->all())) { + if (! $service->update($id, $request->all())) { throw new RuntimeException($service->getError()); } $workflow = WorkFlowService::make(); - if (!$workflow->apply($model->workflow, $user)) { + if (! $workflow->apply($model->workflow, $user)) { throw new RuntimeException($workflow->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); @@ -94,11 +99,12 @@ class SignRepairController extends Controller try { DB::beginTransaction(); - if (!$service->delete($id)) { + if (! $service->delete($id)) { throw new RuntimeException($service->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/LedgerController.php b/app/Http/Controllers/Api/LedgerController.php index b6d4f65..8f0d164 100644 --- a/app/Http/Controllers/Api/LedgerController.php +++ b/app/Http/Controllers/Api/LedgerController.php @@ -2,9 +2,7 @@ namespace App\Http\Controllers\Api; -use App\Enums\TaskStatus; use App\Exceptions\RuntimeException; -use App\Http\Controllers\Api\Controller; use App\Models\Keyword; use App\Models\Ledger; use App\Models\LedgerItem; @@ -220,6 +218,7 @@ class LedgerController extends Controller $items = $lotteryTypes->map(function ($lotteryType) use ($ledgerItems) { $ledgerItem = $ledgerItems->get($lotteryType->key); + return [ 'id' => $lotteryType->key, 'name' => $lotteryType->name, diff --git a/app/Http/Controllers/Api/MessageController.php b/app/Http/Controllers/Api/MessageController.php index 894f88a..170ed4d 100644 --- a/app/Http/Controllers/Api/MessageController.php +++ b/app/Http/Controllers/Api/MessageController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Api; use App\Filters\MessageFilter; -use App\Http\Controllers\Api\Controller; use App\Http\Resources\MessageResource; use App\Models\Message; use App\Models\MessageReadingLog; @@ -37,8 +36,8 @@ class MessageController extends Controller return [ 'data' => $list, 'meta' => [ - 'total' => $paginator->total() - ] + 'total' => $paginator->total(), + ], ]; } diff --git a/app/Http/Controllers/Api/ReimbursementController.php b/app/Http/Controllers/Api/ReimbursementController.php index 7fce501..59d98a8 100644 --- a/app/Http/Controllers/Api/ReimbursementController.php +++ b/app/Http/Controllers/Api/ReimbursementController.php @@ -3,13 +3,17 @@ namespace App\Http\Controllers\Api; use App\Admin\Services\WorkFlowService; +use App\Enums\CheckStatus; use App\Exceptions\RuntimeException; -use App\Http\Resources\{ReimbursementResource, WorkflowLogResource}; -use App\Models\{Keyword, Reimbursement, WorkflowCheck}; -use Illuminate\Http\{Request, Response}; +use App\Http\Resources\ReimbursementResource; +use App\Http\Resources\WorkflowLogResource; +use App\Models\Keyword; +use App\Models\Reimbursement; +use App\Models\WorkflowCheck; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; -use App\Enums\CheckStatus; use Throwable; /** @@ -76,6 +80,7 @@ class ReimbursementController extends Controller public function show($id, Request $request): ReimbursementResource { $reimbursement = Reimbursement::with(['type', 'workflow', 'employee', 'store'])->findOrFail($id); + return ReimbursementResource::make($reimbursement); } @@ -154,8 +159,8 @@ class ReimbursementController extends Controller { $user = $request->user(); $query = Reimbursement::with(['workflow', 'type', 'store']) - ->whereHas('workflow', fn($q) => $q->where('check_status', CheckStatus::Processing)) - ->whereHas('workflow.logs', fn($q) => $q->own($user))->orderBy('created_at', 'desc'); + ->whereHas('workflow', fn ($q) => $q->where('check_status', CheckStatus::Processing)) + ->whereHas('workflow.logs', fn ($q) => $q->own($user))->orderBy('created_at', 'desc'); $list = $query->paginate($request->input('per_page')); @@ -166,7 +171,7 @@ class ReimbursementController extends Controller { $request->validate([ 'status' => ['required'], - 'remarks' => [Rule::requiredIf(fn() => !$request->input('status'))] + 'remarks' => [Rule::requiredIf(fn () => ! $request->input('status'))], ], [ 'remarks.required_if' => '未通过原因必填', ]); @@ -175,14 +180,15 @@ class ReimbursementController extends Controller try { DB::beginTransaction(); $log = $info->workflow->logs()->where('check_status', CheckStatus::Processing)->first(); - if (!$log) { + if (! $log) { throw new RuntimeException('审核已经完成'); } - if (!$workFlowService->check($user, $log, !!$request->input('status'), ['remarks' => $request->input('remarks')])) { + if (! $workFlowService->check($user, $log, (bool) $request->input('status'), ['remarks' => $request->input('remarks')])) { throw new RuntimeException($workFlowService->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/TaskController.php b/app/Http/Controllers/Api/TaskController.php index 728552e..8844c08 100644 --- a/app/Http/Controllers/Api/TaskController.php +++ b/app/Http/Controllers/Api/TaskController.php @@ -32,13 +32,13 @@ MySQL; /** @var \Illuminate\Database\Eloquent\Collection */ $tasks = Task::with([ - 'taskable' => function (MorphTo $morphTo) { - $morphTo->morphWith([ - TaskHygiene::class => ['workflow'], - TaskLedger::class, - ]); - }, - ]) + 'taskable' => function (MorphTo $morphTo) { + $morphTo->morphWith([ + TaskHygiene::class => ['workflow'], + TaskLedger::class, + ]); + }, + ]) ->whereHasMorph( 'taskable', [TaskHygiene::class, TaskLedger::class], @@ -63,6 +63,7 @@ MySQL; return TaskResource::collection( $tasks->through(function ($task) { $task->taskable->setRelation('task', $task->withoutRelations()); + return $task; }) ); diff --git a/app/Http/Controllers/Api/Train/BookController.php b/app/Http/Controllers/Api/Train/BookController.php index 73aa9a0..7f65b74 100644 --- a/app/Http/Controllers/Api/Train/BookController.php +++ b/app/Http/Controllers/Api/Train/BookController.php @@ -3,9 +3,9 @@ namespace App\Http\Controllers\Api\Train; use App\Http\Controllers\Api\Controller; -use Illuminate\Http\Request; -use App\Models\Train\Book; use App\Http\Resources\TrainBookResource; +use App\Models\Train\Book; +use Illuminate\Http\Request; /** * 培训-课件 @@ -17,7 +17,7 @@ class BookController extends Controller $list = Book::filter($request->all()) ->orderBy('created_at', 'desc') ->paginate($request->input('per_page')); - + return TrainBookResource::collection($list); } diff --git a/app/Http/Controllers/Api/Train/ExaminationController.php b/app/Http/Controllers/Api/Train/ExaminationController.php index 3494967..e6502be 100644 --- a/app/Http/Controllers/Api/Train/ExaminationController.php +++ b/app/Http/Controllers/Api/Train/ExaminationController.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers\Api\Train; -use App\Http\Controllers\Api\Controller; -use Illuminate\Http\Request; -use App\Models\Train\{Paper, Examination}; -use App\Http\Resources\{TrainExaminationResource, TrainPaperResource}; -use App\Enums\ExamStatus; use App\Admin\Services\Train\PaperService; -use Illuminate\Support\Facades\DB; +use App\Enums\ExamStatus; use App\Exceptions\RuntimeException; +use App\Http\Controllers\Api\Controller; +use App\Http\Resources\TrainPaperResource; +use App\Models\Train\Paper; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; /** * 培训-考试 @@ -21,10 +21,10 @@ class ExaminationController extends Controller $user = $this->guard()->user(); $list = Paper::with(['examination']) ->where('employee_id', $user->id) - ->whereHas('examination', fn($q) => $q->where('exam_status', ExamStatus::Published)) + ->whereHas('examination', fn ($q) => $q->where('exam_status', ExamStatus::Published)) ->orderBy('created_at', 'desc') ->paginate($request->input('per_page')); - + return TrainPaperResource::collection($list); } @@ -39,18 +39,19 @@ class ExaminationController extends Controller public function answer($id, Request $request, PaperService $service) { $request->validate([ - 'answers' => ['required', 'array'] + 'answers' => ['required', 'array'], ]); $user = $this->guard()->user(); $info = Paper::with(['examination'])->where('employee_id', $user->id)->findOrFail($id); try { DB::beginTransaction(); - if (!$service->answer($info, $request->input('answers'))) { + if (! $service->answer($info, $request->input('answers'))) { throw new RuntimeException($service->getError()); } DB::commit(); + return TrainPaperResource::make($info); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/WorkflowController copy.php b/app/Http/Controllers/Api/WorkflowController copy.php index 3fe7765..4a3a42a 100644 --- a/app/Http/Controllers/Api/WorkflowController copy.php +++ b/app/Http/Controllers/Api/WorkflowController copy.php @@ -11,10 +11,10 @@ use App\Models\Task; use App\Models\TaskHygiene; use App\Models\TaskLedger; use App\Models\WorkflowCheck; -use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\MorphTo; use Illuminate\Database\Eloquent\Relations\Relation; -use Illuminate\Http\{Request, Response}; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; @@ -39,7 +39,7 @@ class WorkflowController extends Controller $query = $model::query()->with($include) // ->whereHas('workflow', fn($q) => $q->where('check_status', CheckStatus::Processing)) - ->whereHas('workflow.logs', fn($q) => $q->own($user)->where('check_status', '>', CheckStatus::None->value)) + ->whereHas('workflow.logs', fn ($q) => $q->own($user)->where('check_status', '>', CheckStatus::None->value)) ->orderBy('created_at', 'desc'); $list = $query->paginate($request->input('per_page')); @@ -110,11 +110,11 @@ class WorkflowController extends Controller if ($subjectType == (new TaskHygiene)->getMorphClass()) { $task = Task::findOrFail($id); $taskable = $task->taskable; - if (!$taskable) { + if (! $taskable) { throw new RuntimeException('任务不存在'); } $check = $taskable->workflow; - if (!$check) { + if (! $check) { throw new RuntimeException('审核记录不存在'); } } else { @@ -134,11 +134,11 @@ class WorkflowController extends Controller if ($subjectType == (new TaskHygiene)->getMorphClass()) { $task = Task::findOrFail($id); $taskable = $task->taskable; - if (!$taskable) { + if (! $taskable) { throw new RuntimeException('任务不存在'); } $check = $taskable->workflow; - if (!$check) { + if (! $check) { throw new RuntimeException('审核记录不存在'); } } else { @@ -146,11 +146,12 @@ class WorkflowController extends Controller } try { DB::beginTransaction(); - if (!$workFlowService->cancel($check)) { + if (! $workFlowService->cancel($check)) { throw new RuntimeException($workFlowService->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); @@ -163,7 +164,7 @@ class WorkflowController extends Controller $request->validate([ 'subject_type' => 'required', 'status' => ['required'], - 'remarks' => [Rule::requiredIf(fn() => !$request->input('status'))] + 'remarks' => [Rule::requiredIf(fn () => ! $request->input('status'))], ], [ 'remarks.required_if' => '未通过原因必填', ]); @@ -171,11 +172,11 @@ class WorkflowController extends Controller if ($subjectType == (new TaskHygiene)->getMorphClass()) { $task = Task::findOrFail($id); $taskable = $task->taskable; - if (!$taskable) { + if (! $taskable) { throw new RuntimeException('任务不存在'); } $check = $taskable->workflow; - if (!$check) { + if (! $check) { throw new RuntimeException('审核记录不存在'); } } else { @@ -185,14 +186,15 @@ class WorkflowController extends Controller try { DB::beginTransaction(); $log = $check->logs()->where('check_status', CheckStatus::Processing)->first(); - if (!$log) { + if (! $log) { throw new RuntimeException('审核已经完成'); } - if (!$workFlowService->check($user, $log, !!$request->input('status'), ['remarks' => $request->input('remarks')])) { + if (! $workFlowService->check($user, $log, (bool) $request->input('status'), ['remarks' => $request->input('remarks')])) { throw new RuntimeException($workFlowService->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Api/WorkflowController.php b/app/Http/Controllers/Api/WorkflowController.php index ed74d8a..573d6a7 100644 --- a/app/Http/Controllers/Api/WorkflowController.php +++ b/app/Http/Controllers/Api/WorkflowController.php @@ -8,8 +8,10 @@ use App\Exceptions\RuntimeException; use App\Http\Resources\TaskResource; use App\Http\Resources\WorkflowLogResource; use App\Models\TaskHygiene; -use App\Models\{WorkflowCheck, WorkflowLog}; -use Illuminate\Http\{Request, Response}; +use App\Models\WorkflowCheck; +use App\Models\WorkflowLog; +use Illuminate\Http\Request; +use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Illuminate\Validation\Rule; @@ -36,7 +38,7 @@ class WorkflowController extends Controller MySQL; $list = WorkflowLog::with($include) - ->whereHas('check', fn($q) => $q->where('subject_type', $subjectType)) + ->whereHas('check', fn ($q) => $q->where('subject_type', $subjectType)) ->own($user) ->where('check_status', '>', CheckStatus::None->value) ->orderBy(DB::raw($orderBy), 'DESC') @@ -79,11 +81,12 @@ MySQL; $check = WorkflowCheck::where('employee_id', $user->id)->findOrFail($id); try { DB::beginTransaction(); - if (!$workFlowService->cancel($check)) { + if (! $workFlowService->cancel($check)) { throw new RuntimeException($workFlowService->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); @@ -95,7 +98,7 @@ MySQL; { $request->validate([ 'status' => ['required'], - 'remarks' => [Rule::requiredIf(fn() => !$request->input('status'))] + 'remarks' => [Rule::requiredIf(fn () => ! $request->input('status'))], ], [ 'remarks.required_if' => '未通过原因必填', ]); @@ -103,11 +106,12 @@ MySQL; $user = $this->guard()->user(); try { DB::beginTransaction(); - if (!$workFlowService->check($user, $log, !!$request->input('status'), ['remarks' => $request->input('remarks')])) { + if (! $workFlowService->check($user, $log, (bool) $request->input('status'), ['remarks' => $request->input('remarks')])) { throw new RuntimeException($workFlowService->getError()); } DB::commit(); + return response('', Response::HTTP_OK); } catch (\Exception $e) { DB::rollBack(); diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 432acfd..86b6717 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -15,16 +15,16 @@ class PageController extends Controller $background = $websiteConfig['download_page_background'] ?? null; $apkDownloadUrl = AppVersion::onlyReleased() - ->where('os', AppOs::Android) - ->whereNotNull('apk_url') - ->latest('version') - ->value('apk_url'); + ->where('os', AppOs::Android) + ->whereNotNull('apk_url') + ->latest('version') + ->value('apk_url'); $iosDownloadUrl = AppVersion::onlyReleased() - ->where('os', AppOs::Ios) - ->whereNotNull('apk_url') - ->latest('version') - ->value('apk_url'); + ->where('os', AppOs::Ios) + ->whereNotNull('apk_url') + ->latest('version') + ->value('apk_url'); return view('page.home', compact('apkDownloadUrl', 'iosDownloadUrl', 'background')); } diff --git a/app/Http/Middleware/CheckUserRole.php b/app/Http/Middleware/CheckUserRole.php index 2bbe58f..ac3e2f4 100644 --- a/app/Http/Middleware/CheckUserRole.php +++ b/app/Http/Middleware/CheckUserRole.php @@ -5,7 +5,6 @@ namespace App\Http\Middleware; use Closure; use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\Response; -use Illuminate\Support\Arr; class CheckUserRole { @@ -25,9 +24,10 @@ class CheckUserRole $hasPermissions = true; } } - if (!$hasPermissions) { + if (! $hasPermissions) { throw new \App\Exceptions\RuntimeException('没有权限'); } + return $next($request); } } diff --git a/app/Http/Resources/AgreementResource.php b/app/Http/Resources/AgreementResource.php index dc47409..51d74f0 100644 --- a/app/Http/Resources/AgreementResource.php +++ b/app/Http/Resources/AgreementResource.php @@ -26,7 +26,7 @@ class AgreementResource extends JsonResource 'store' => StoreResource::make($this->whenLoaded('store')), 'workflow_check' => WorkflowCheckResource::make($this->whenLoaded('workflow')), - + 'created_at' => $this->created_at->timestamp, 'created_format' => $this->created_at->format('Y-m-d H:i:s'), ]; diff --git a/app/Http/Resources/HolidayApplyResource.php b/app/Http/Resources/HolidayApplyResource.php index a6a0fc4..b8a8b3f 100644 --- a/app/Http/Resources/HolidayApplyResource.php +++ b/app/Http/Resources/HolidayApplyResource.php @@ -34,7 +34,7 @@ class HolidayApplyResource extends JsonResource 'reason' => $this->reason, 'created_at' => $this->created_at->timestamp, - 'created_format' => $this->created_at->format('Y-m-d H:i:s') + 'created_format' => $this->created_at->format('Y-m-d H:i:s'), ]; } } diff --git a/app/Http/Resources/OfficalBusinessResource.php b/app/Http/Resources/OfficalBusinessResource.php index 4eb9629..bfb4daa 100644 --- a/app/Http/Resources/OfficalBusinessResource.php +++ b/app/Http/Resources/OfficalBusinessResource.php @@ -33,7 +33,7 @@ class OfficalBusinessResource extends JsonResource 'reason' => $this->reason, 'created_at' => $this->created_at->timestamp, - 'created_format' => $this->created_at->format('Y-m-d H:i:s') + 'created_format' => $this->created_at->format('Y-m-d H:i:s'), ]; } } diff --git a/app/Http/Resources/TaskHygieneResource.php b/app/Http/Resources/TaskHygieneResource.php index 6e16491..d5b7bfe 100644 --- a/app/Http/Resources/TaskHygieneResource.php +++ b/app/Http/Resources/TaskHygieneResource.php @@ -4,7 +4,6 @@ namespace App\Http\Resources; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; -use App\Enums\TaskHygieneStatus; class TaskHygieneResource extends JsonResource { diff --git a/app/Http/Resources/TaskResource.php b/app/Http/Resources/TaskResource.php index 9599c46..ce4b23b 100644 --- a/app/Http/Resources/TaskResource.php +++ b/app/Http/Resources/TaskResource.php @@ -2,11 +2,8 @@ namespace App\Http\Resources; -use App\Models\TaskHygiene; -use App\Models\TaskLedger; -use App\Models\TaskPerformance; -use Illuminate\Database\Eloquent\Relations\Relation; use App\Exceptions\RuntimeException; +use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; @@ -20,6 +17,7 @@ class TaskResource extends JsonResource public function toArray(Request $request): array { $resource = $this->mapResource($this->taskable_type); + return [ 'id' => $this->id, 'name' => $this->name, diff --git a/app/Http/Resources/TrainPaperResource.php b/app/Http/Resources/TrainPaperResource.php index b0638f1..bea4ae2 100644 --- a/app/Http/Resources/TrainPaperResource.php +++ b/app/Http/Resources/TrainPaperResource.php @@ -22,7 +22,7 @@ class TrainPaperResource extends JsonResource 'employee' => EmployeeResource::make($this->whenLoaded('employee')), 'content' => $this->content, 'mark' => $this->mark, - 'finished_at' => $this->finished_at?->timestamp + 'finished_at' => $this->finished_at?->timestamp, ]; } } diff --git a/app/Http/Resources/WorkflowCheckResource.php b/app/Http/Resources/WorkflowCheckResource.php index 47a0721..fb61630 100644 --- a/app/Http/Resources/WorkflowCheckResource.php +++ b/app/Http/Resources/WorkflowCheckResource.php @@ -2,9 +2,9 @@ namespace App\Http\Resources; +use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; -use Illuminate\Database\Eloquent\Relations\Relation; use RuntimeException; class WorkflowCheckResource extends JsonResource @@ -17,6 +17,7 @@ class WorkflowCheckResource extends JsonResource public function toArray(Request $request): array { $resource = $this->mapResource($this->subject_type); + return [ 'id' => $this->id, 'check_status' => $this->check_status, diff --git a/app/Http/Resources/WorkflowLogResource.php b/app/Http/Resources/WorkflowLogResource.php index 9d7998b..ecabf7e 100644 --- a/app/Http/Resources/WorkflowLogResource.php +++ b/app/Http/Resources/WorkflowLogResource.php @@ -3,7 +3,6 @@ namespace App\Http\Resources; use Illuminate\Http\Request; -use App\Enums\CheckStatus; use Illuminate\Http\Resources\Json\JsonResource; class WorkflowLogResource extends JsonResource diff --git a/app/Listeners/CreateWorkflowCheckFailedMessage.php b/app/Listeners/CreateWorkflowCheckFailedMessage.php index 3441039..4cded42 100644 --- a/app/Listeners/CreateWorkflowCheckFailedMessage.php +++ b/app/Listeners/CreateWorkflowCheckFailedMessage.php @@ -4,12 +4,6 @@ namespace App\Listeners; use App\Enums\MessageType; use App\Events\WorkflowCheckFailed; -use App\Models\EmployeePromotion; -use App\Models\EmployeeSignRepair; -use App\Models\HolidayApply; -use App\Models\OfficalBusiness; -use App\Models\OvertimeApply; -use App\Models\Reimbursement; use App\Services\MessageService; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; @@ -23,7 +17,8 @@ class CreateWorkflowCheckFailedMessage implements ShouldQueue */ public function __construct( public MessageService $messageService, - ) {} + ) { + } /** * Handle the event. diff --git a/app/Listeners/CreateWorkflowCheckNextMessage.php b/app/Listeners/CreateWorkflowCheckNextMessage.php index 687098d..38055f9 100644 --- a/app/Listeners/CreateWorkflowCheckNextMessage.php +++ b/app/Listeners/CreateWorkflowCheckNextMessage.php @@ -19,7 +19,8 @@ class CreateWorkflowCheckNextMessage implements ShouldQueue */ public function __construct( public MessageService $messageService, - ) {} + ) { + } /** * Handle the event. diff --git a/app/Listeners/CreateWorkflowCheckSuccessMessage.php b/app/Listeners/CreateWorkflowCheckSuccessMessage.php index f516b65..1a067dc 100644 --- a/app/Listeners/CreateWorkflowCheckSuccessMessage.php +++ b/app/Listeners/CreateWorkflowCheckSuccessMessage.php @@ -17,7 +17,8 @@ class CreateWorkflowCheckSuccessMessage implements ShouldQueue */ public function __construct( public MessageService $messageService, - ) {} + ) { + } /** * Handle the event. diff --git a/app/Listeners/SendWorkflowCheckFailedNotification.php b/app/Listeners/SendWorkflowCheckFailedNotification.php index 9406989..7c9fbb5 100644 --- a/app/Listeners/SendWorkflowCheckFailedNotification.php +++ b/app/Listeners/SendWorkflowCheckFailedNotification.php @@ -40,15 +40,15 @@ class SendWorkflowCheckFailedNotification implements ShouldQueue $client = new EasySms(config('easysms')); $client->send($phone, [ - 'content' => function($gateway) use ($applyAt, $subjectTypeText) { + 'content' => function ($gateway) use ($applyAt, $subjectTypeText) { return "您于{$applyAt->toDateString()}提交的{$subjectTypeText}未通过审批，请登录查看。"; }, - 'template' => function($gateway) { + 'template' => function ($gateway) { if ($gateway->getName() == 'aliyun') { return 'SMS_465905330'; } }, - 'data' => function($gateway) use ($applyAt, $subjectTypeText) { + 'data' => function ($gateway) use ($applyAt, $subjectTypeText) { return [ 'time' => $applyAt->toDateString(), 'work_msg' => $subjectTypeText, diff --git a/app/Listeners/SendWorkflowCheckNextNotification.php b/app/Listeners/SendWorkflowCheckNextNotification.php index 770697c..3df3ec1 100644 --- a/app/Listeners/SendWorkflowCheckNextNotification.php +++ b/app/Listeners/SendWorkflowCheckNextNotification.php @@ -54,15 +54,15 @@ class SendWorkflowCheckNextNotification implements ShouldQueue foreach ($employees as $employee) { try { $client->send($employee->phone, [ - 'content' => function($gateway) use ($subjectTypeText) { + 'content' => function ($gateway) use ($subjectTypeText) { return "您有一条{$subjectTypeText}待处理，请尽快登录处理。"; }, - 'template' => function($gateway) { + 'template' => function ($gateway) { if ($gateway->getName() == 'aliyun') { return 'SMS_465900349'; } }, - 'data' => function($gateway) use ($subjectTypeText) { + 'data' => function ($gateway) use ($subjectTypeText) { return [ 'work_msg' => $subjectTypeText, ]; diff --git a/app/Listeners/SendWorkflowCheckSuccessNotification.php b/app/Listeners/SendWorkflowCheckSuccessNotification.php index c1bec14..730d55c 100644 --- a/app/Listeners/SendWorkflowCheckSuccessNotification.php +++ b/app/Listeners/SendWorkflowCheckSuccessNotification.php @@ -40,15 +40,15 @@ class SendWorkflowCheckSuccessNotification implements ShouldQueue $client = new EasySms(config('easysms')); $client->send($phone, [ - 'content' => function($gateway) use ($applyAt, $subjectTypeText) { + 'content' => function ($gateway) use ($applyAt, $subjectTypeText) { return "您于{$applyAt->toDateString()}提交的{$subjectTypeText}已通过审批，请登录查看。"; }, - 'template' => function($gateway) { + 'template' => function ($gateway) { if ($gateway->getName() == 'aliyun') { return 'SMS_465955319'; } }, - 'data' => function($gateway) use ($applyAt, $subjectTypeText) { + 'data' => function ($gateway) use ($applyAt, $subjectTypeText) { return [ 'time' => $applyAt->toDateString(), 'work_msg' => $subjectTypeText, diff --git a/app/Models/Agreement.php b/app/Models/Agreement.php index ac2a976..18ae28f 100644 --- a/app/Models/Agreement.php +++ b/app/Models/Agreement.php @@ -2,18 +2,17 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Model; +use App\Traits\HasCheckable; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; -use App\Traits\HasCheckable; +use Illuminate\Database\Eloquent\Model; /** * 合同 */ class Agreement extends Model { - use HasDateTimeFormatter, Filterable, HasCheckable; + use Filterable, HasCheckable, HasDateTimeFormatter; protected $fillable = ['name', 'employee_id', 'store_id', 'images', 'remarks']; diff --git a/app/Models/AppVersion.php b/app/Models/AppVersion.php index cbcbfd0..52368f8 100644 --- a/app/Models/AppVersion.php +++ b/app/Models/AppVersion.php @@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model; class AppVersion extends Model { - use Filterable, HasFactory, HasDateTimeFormatter; + use Filterable, HasDateTimeFormatter, HasFactory; protected $appends = [ 'is_release', @@ -76,6 +76,7 @@ class AppVersion extends Model if ((string) $value === '') { $value = null; } + return $value; }, ); @@ -88,6 +89,7 @@ class AppVersion extends Model if ((string) $value === '') { $value = null; } + return $value; }, ); diff --git a/app/Models/Employee.php b/app/Models/Employee.php index 6d07f28..02c19b0 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -4,16 +4,15 @@ namespace App\Models; use App\Admin\Filters\EmployeeFilter; use App\Enums\EmployeeStatus; +use App\Enums\UserRole; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; use Illuminate\Auth\Authenticatable; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; use Laravel\Sanctum\HasApiTokens; -use App\Models\AdminUser; -use App\Enums\UserRole; -use Illuminate\Database\Eloquent\Builder; /** * 员工 @@ -53,7 +52,7 @@ class Employee extends Model implements AuthenticatableContract public function avatar(): Attribute { return Attribute::make( - get: fn($value) => $value ? $value : url(config('admin.default_avatar')), + get: fn ($value) => $value ? $value : url(config('admin.default_avatar')), ); } @@ -136,7 +135,6 @@ class Employee extends Model implements AuthenticatableContract /** * 用户身份 * user: 普通员工, store: 店长, admin: 管理员, store_user: 店员 - * @return array */ public function userRole(): array { diff --git a/app/Models/EmployeePromotion.php b/app/Models/EmployeePromotion.php index 51fe428..855b38b 100644 --- a/app/Models/EmployeePromotion.php +++ b/app/Models/EmployeePromotion.php @@ -7,7 +7,6 @@ use App\Traits\HasCheckable; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\Casts\Attribute; /** * 员工升职申请 diff --git a/app/Models/EmployeeSignRepair.php b/app/Models/EmployeeSignRepair.php index 669d463..00289c6 100644 --- a/app/Models/EmployeeSignRepair.php +++ b/app/Models/EmployeeSignRepair.php @@ -2,13 +2,13 @@ namespace App\Models; -use App\Enums\{SignTime, SignType, CheckStatus}; +use App\Admin\Services\EmployeeSignService; +use App\Enums\SignTime; +use App\Enums\SignType; use App\Traits\HasCheckable; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; use Illuminate\Database\Eloquent\Model; -use App\Models\EmployeeSignLog; -use App\Admin\Services\EmployeeSignService; /** * 补卡申请 diff --git a/app/Models/OvertimeApply.php b/app/Models/OvertimeApply.php index b82188b..45cd6e6 100644 --- a/app/Models/OvertimeApply.php +++ b/app/Models/OvertimeApply.php @@ -3,7 +3,8 @@ namespace App\Models; use App\Enums\{CheckStatus}; -use App\Traits\{HasCheckable, HasDateTimeFormatter}; +use App\Traits\HasCheckable; +use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/Plan.php b/app/Models/Plan.php index 3664504..36437c1 100644 --- a/app/Models/Plan.php +++ b/app/Models/Plan.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; class Plan extends Model { - use Filterable, HasFactory, HasDateTimeFormatter; + use Filterable, HasDateTimeFormatter, HasFactory; protected $attributes = [ 'plan_status' => PlanStatus::Pending, diff --git a/app/Models/PlanLedger.php b/app/Models/PlanLedger.php index c53ec6f..c59b13f 100644 --- a/app/Models/PlanLedger.php +++ b/app/Models/PlanLedger.php @@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne; class PlanLedger extends Model { - use HasFactory, HasDateTimeFormatter; + use HasDateTimeFormatter, HasFactory; protected $fillable = [ 'date', @@ -20,4 +20,3 @@ class PlanLedger extends Model return $this->morphOne(Plan::class, 'planable'); } } - diff --git a/app/Models/Store.php b/app/Models/Store.php index 2bb3052..68a5ce5 100644 --- a/app/Models/Store.php +++ b/app/Models/Store.php @@ -84,7 +84,7 @@ class Store extends Model */ public function isLotteryStore(): bool { - return 'store_category_lottery' === $this->category_id || preg_match('/^store_category_lottery_/', $this->category_id); + return $this->category_id === 'store_category_lottery' || preg_match('/^store_category_lottery_/', $this->category_id); } protected function businessStatusText(): Attribute diff --git a/app/Models/StoreProfitRatioLog.php b/app/Models/StoreProfitRatioLog.php index 9036be8..5b6636d 100644 --- a/app/Models/StoreProfitRatioLog.php +++ b/app/Models/StoreProfitRatioLog.php @@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class StoreProfitRatioLog extends Model { - use Filterable, HasFactory, HasDateTimeFormatter; + use Filterable, HasDateTimeFormatter, HasFactory; protected $fillable = [ 'store_id', diff --git a/app/Models/Task.php b/app/Models/Task.php index 063f352..2ceb802 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo; class Task extends Model { - use Filterable, HasFactory, HasDateTimeFormatter; + use Filterable, HasDateTimeFormatter, HasFactory; protected $attributes = [ 'task_status' => TaskStatus::Pending, diff --git a/app/Models/TaskHygiene.php b/app/Models/TaskHygiene.php index 1d12583..65d3f96 100644 --- a/app/Models/TaskHygiene.php +++ b/app/Models/TaskHygiene.php @@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne; class TaskHygiene extends Model { - use HasCheckable, HasFactory, HasDateTimeFormatter; + use HasCheckable, HasDateTimeFormatter, HasFactory; protected $appends = [ 'task_status', diff --git a/app/Models/TaskLedger.php b/app/Models/TaskLedger.php index 358ff31..3ddcbd3 100644 --- a/app/Models/TaskLedger.php +++ b/app/Models/TaskLedger.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne; class TaskLedger extends Model { - use HasFactory, HasDateTimeFormatter; + use HasDateTimeFormatter, HasFactory; protected $appends = [ 'task_status', diff --git a/app/Models/TaskPerformance.php b/app/Models/TaskPerformance.php index d0becad..a97bcb7 100644 --- a/app/Models/TaskPerformance.php +++ b/app/Models/TaskPerformance.php @@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne; class TaskPerformance extends Model { - use HasFactory, HasDateTimeFormatter; + use HasDateTimeFormatter, HasFactory; protected $appends = [ 'task_status', diff --git a/app/Models/Train/Book.php b/app/Models/Train/Book.php index ed6abf1..8287abf 100644 --- a/app/Models/Train/Book.php +++ b/app/Models/Train/Book.php @@ -2,21 +2,21 @@ namespace App\Models\Train; -use Illuminate\Database\Eloquent\Model; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; +use Illuminate\Database\Eloquent\Model; /** * 培训管理-课件 */ class Book extends Model { - use HasDateTimeFormatter, Filterable; + use Filterable, HasDateTimeFormatter; protected $table = 'train_books'; protected $fillable = ['category_id', 'title', 'cover_image', 'description', 'type', 'content', 'video', 'files']; - + protected $casts = [ 'type' => \App\Enums\BookType::class, // [{id:"5ab12064fee5", name:"a.txt", value:"https://xx.com/a.txt", state:"uploaded"}] diff --git a/app/Models/Train/Examination.php b/app/Models/Train/Examination.php index 8c5f6ed..58c440f 100644 --- a/app/Models/Train/Examination.php +++ b/app/Models/Train/Examination.php @@ -2,16 +2,16 @@ namespace App\Models\Train; -use Illuminate\Database\Eloquent\Model; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; +use Illuminate\Database\Eloquent\Model; /** * 培训管理-考试 */ class Examination extends Model { - use HasDateTimeFormatter, Filterable; + use Filterable, HasDateTimeFormatter; protected $table = 'train_examinations'; diff --git a/app/Models/Train/Paper.php b/app/Models/Train/Paper.php index 34ea136..1980c18 100644 --- a/app/Models/Train/Paper.php +++ b/app/Models/Train/Paper.php @@ -2,17 +2,17 @@ namespace App\Models\Train; -use Illuminate\Database\Eloquent\Model; +use App\Models\Employee; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; -use App\Models\Employee; +use Illuminate\Database\Eloquent\Model; /** * 培训-试卷 */ class Paper extends Model { - use HasDateTimeFormatter, Filterable; + use Filterable, HasDateTimeFormatter; protected $table = 'train_examination_papers'; diff --git a/app/Models/Train/Question.php b/app/Models/Train/Question.php index fa2ac3c..7c20553 100644 --- a/app/Models/Train/Question.php +++ b/app/Models/Train/Question.php @@ -2,16 +2,16 @@ namespace App\Models\Train; -use Illuminate\Database\Eloquent\Model; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; +use Illuminate\Database\Eloquent\Model; /** * 题库 */ class Question extends Model { - use HasDateTimeFormatter, Filterable; + use Filterable, HasDateTimeFormatter; protected $table = 'train_questions'; diff --git a/app/Models/WorkflowCheck.php b/app/Models/WorkflowCheck.php index 0fb81de..f11ef47 100644 --- a/app/Models/WorkflowCheck.php +++ b/app/Models/WorkflowCheck.php @@ -2,7 +2,8 @@ namespace App\Models; -use App\Enums\{CheckStatus, CheckType}; +use App\Enums\CheckStatus; +use App\Enums\CheckType; use App\Traits\HasDateTimeFormatter; use EloquentFilter\Filterable; use Illuminate\Database\Eloquent\Model; diff --git a/app/Models/WorkflowLog.php b/app/Models/WorkflowLog.php index 438802f..f9532a9 100644 --- a/app/Models/WorkflowLog.php +++ b/app/Models/WorkflowLog.php @@ -39,10 +39,11 @@ class WorkflowLog extends Model $checkValue = [$user->id]; $userJobs = $user->jobs; if ($userJobs && $userJobs->count() > 0) { - foreach($userJobs->unique('key') as $item) { - array_push($checkValue, $user->store_id . '-' . $item->key); + foreach ($userJobs->unique('key') as $item) { + array_push($checkValue, $user->store_id.'-'.$item->key); } } + return $builder->whereIn('check_value', $checkValue); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 8a4e6b2..117bd74 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,8 +4,8 @@ namespace App\Providers; use Illuminate\Database\Eloquent\Relations\Relation; use Illuminate\Http\Resources\Json\JsonResource; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Validator; +use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider { diff --git a/app/Services/MessageService.php b/app/Services/MessageService.php index a8f3272..72d7178 100644 --- a/app/Services/MessageService.php +++ b/app/Services/MessageService.php @@ -11,7 +11,7 @@ class MessageService /** * 创建消息通知 * - * @param array $employees + * @param array $employees */ public function create(MessageType $type, ?string $title, ?string $content, array $employees = [], array $additional = []) { @@ -19,6 +19,7 @@ class MessageService if ($employee instanceof Employee) { return $employee->id; } + return (int) $employee; })->all(); diff --git a/app/Services/StatisticService.php b/app/Services/StatisticService.php index e2885d2..036c4f7 100644 --- a/app/Services/StatisticService.php +++ b/app/Services/StatisticService.php @@ -96,7 +96,7 @@ class StatisticService $trend = collect(); - for ($i=0; $i < $diffMonths; $i++) { + for ($i = 0; $i < $diffMonths; $i++) { $month = $start->format('Y-m'); $aggregate = $aggregates->get($month); @@ -127,11 +127,11 @@ class StatisticService /** @var \Illuminate\Support\Collection */ $ledgerStatistics = Ledger::select([ - 'date', - DB::raw('SUM(new_customers) as new_customers'), - DB::raw('SUM(sales) as sales'), - DB::raw('SUM(expenditure) as expenditure') - ]) + 'date', + DB::raw('SUM(new_customers) as new_customers'), + DB::raw('SUM(sales) as sales'), + DB::raw('SUM(expenditure) as expenditure'), + ]) ->filter($input, LedgerFilter::class) ->groupBy(['date']) ->get() @@ -139,11 +139,11 @@ class StatisticService /** @var \Illuminate\Support\Collection */ $ledgerItemStatistics = LedgerItem::select([ - 'date', - 'ledger_item_type_id', - DB::raw('SUM(sales) as sales'), - DB::raw('SUM(expenditure) as expenditure'), - ]) + 'date', + 'ledger_item_type_id', + DB::raw('SUM(sales) as sales'), + DB::raw('SUM(expenditure) as expenditure'), + ]) ->filter($input, LedgerItemFilter::class) ->whereIn('ledger_item_type_id', $lotteryTypes->pluck('key')) ->groupBy(['date', 'ledger_item_type_id']) @@ -168,6 +168,7 @@ class StatisticService ], 'lottery_types' => $lotteryTypes->map(function ($lotteryType) use ($lotteryTypeStatistics) { $lotteryTypeStatistic = $lotteryTypeStatistics->get($lotteryType->key); + return [ 'name' => $lotteryType->name, 'sales' => trim_zeros($lotteryTypeStatistic->sales ?? 0), @@ -188,11 +189,11 @@ class StatisticService public function storeRanking(array $input = [], int $top = 0): array { $storeLedgers = Ledger::select([ - 'store_id', - DB::raw('SUM(sales) as sales'), - DB::raw('SUM(expenditure) as expenditure'), - DB::raw('SUM(new_customers) as new_customers'), - ]) + 'store_id', + DB::raw('SUM(sales) as sales'), + DB::raw('SUM(expenditure) as expenditure'), + DB::raw('SUM(new_customers) as new_customers'), + ]) ->filter(Arr::except($input, ['region']), LedgerFilter::class) ->groupBy('store_id'); diff --git a/app/Traits/HasCheckable.php b/app/Traits/HasCheckable.php index e4ae465..1c71e83 100644 --- a/app/Traits/HasCheckable.php +++ b/app/Traits/HasCheckable.php @@ -2,9 +2,9 @@ namespace App\Traits; +use App\Enums\CheckStatus; use App\Models\WorkflowCheck; use Illuminate\Support\Str; -use App\Enums\CheckStatus; trait HasCheckable { diff --git a/app/Traits/UploadTrait.php b/app/Traits/UploadTrait.php index b8ff617..a399185 100644 --- a/app/Traits/UploadTrait.php +++ b/app/Traits/UploadTrait.php @@ -26,17 +26,17 @@ trait UploadTrait public function uploadRich() { $fromWangEditor = false; - $file = request()->file('file'); + $file = request()->file('file'); - if (!$file) { + if (! $file) { $fromWangEditor = true; - $file = request()->file('wangeditor-uploaded-image'); - if (!$file) { + $file = request()->file('wangeditor-uploaded-image'); + if (! $file) { $file = request()->file('wangeditor-uploaded-video'); } } - if (!$file) { + if (! $file) { return $this->response()->additional(['errno' => 1])->fail(__('admin.upload_file_error')); } @@ -58,7 +58,7 @@ trait UploadTrait { $file = request()->file('file'); - if (!$file) { + if (! $file) { return $this->response()->fail(__('admin.upload_file_error')); } @@ -70,71 +70,72 @@ trait UploadTrait return $this->response()->success(['value' => $path]); } - public function saveImage($field = 'image', $path) + public function saveImage($field, $path) { - return $this->saveFile($field, $path); + return $this->saveFile($field, $path); } /** * 表单提交时，转存实际目录，并保留上传时文件名称；文件保存全路径 */ - public function saveFile($field = 'file', $path) + public function saveFile($field, $path) { $file = request()->file($field); - if (!$file) { - $file = request()->get($field); + if (! $file) { + $file = request()->get($field); } $fileArr = []; //判断是否多个文件； - if(is_string($file) || isset($file['id'])){ + if (is_string($file) || isset($file['id'])) { $files = [$file]; - }else{ + } else { $files = $file; } - if($files){ - foreach($files as $file){ - if(is_array($file) && isset($file['state'])){ - switch($file['state']){ + if ($files) { + foreach ($files as $file) { + if (is_array($file) && isset($file['state'])) { + switch ($file['state']) { case 'init': - if(strpos($file['value'], 'temporary') !== false){ + if (strpos($file['value'], 'temporary') !== false) { $filePath = $path.'/'.$file['name']; - $res = Storage::disk(Admin::config('admin.upload.disk'))->move($file['value'], $filePath); - if($res){ + $res = Storage::disk(Admin::config('admin.upload.disk'))->move($file['value'], $filePath); + if ($res) { $fileArr[] = Storage::disk(Admin::config('admin.upload.disk'))->url($filePath); - }else{ + } else { return response()->fail(__('admin.upload_file_error')); } - }else{ + } else { $fileArr[] = $file['value']; } break; case 'uploaded': - if(isset($file['name'])){ + if (isset($file['name'])) { $filePath = $path.'/'.$file['name']; - if(Str::startsWith($file['value'], ['http://', 'https://'])){ + if (Str::startsWith($file['value'], ['http://', 'https://'])) { $fileUrl = parse_url($file['value']); $fileValue = ltrim($fileUrl['path'], '/storage'); - }else{ + } else { $fileValue = $file['value']; } $res = Storage::disk(Admin::config('admin.upload.disk'))->move($fileValue, $filePath); - if($res){ + if ($res) { $fileArr[] = Storage::disk(Admin::config('admin.upload.disk'))->url($filePath); - }else{ + } else { return $this->response()->fail(__('admin.upload_file_error')); } } break; } - }else{ + } else { $fileArr[] = $file; } } } + return $fileArr; } @@ -148,8 +149,8 @@ trait UploadTrait $uploadId = md5(time().$fileName); //创建临时文件夹 - if ( Storage::disk(Admin::config('admin.upload.disk'))->exists(Admin::config('admin.upload.tem_directory.' . $type).'/'.$uploadId) === false ) { - if ( Storage::disk(Admin::config('admin.upload.disk'))->makeDirectory(Admin::config('admin.upload.tem_directory.' . $type).'/'.$uploadId) === false ) { + if (Storage::disk(Admin::config('admin.upload.disk'))->exists(Admin::config('admin.upload.tem_directory.'.$type).'/'.$uploadId) === false) { + if (Storage::disk(Admin::config('admin.upload.disk'))->makeDirectory(Admin::config('admin.upload.tem_directory.'.$type).'/'.$uploadId) === false) { return false; } } @@ -169,17 +170,18 @@ trait UploadTrait $partNumber = request()->get('partNumber'); $partSize = request()->get('partSize'); $fileName = $file->getClientOriginalName(); - $fileName = str_replace(' ', '', $fileName);//去掉空格 + $fileName = str_replace(' ', '', $fileName); //去掉空格 //判断该分片是否已存在， - $dirPath = Admin::config('admin.upload.tem_directory.' . $type).'/'.$uploadId; - if(Storage::disk(Admin::config('admin.upload.disk'))->exists($dirPath . '/'.$fileName.'_'.$partNumber)){ + $dirPath = Admin::config('admin.upload.tem_directory.'.$type).'/'.$uploadId; + if (Storage::disk(Admin::config('admin.upload.disk'))->exists($dirPath.'/'.$fileName.'_'.$partNumber)) { return $this->response()->fail(__('admin.upload_file_error')); - }else{ + } else { //验证分片大小-todo $path = $file->storeAs($dirPath, $fileName.'_'.$partNumber, Admin::config('admin.upload.disk')); $realPath = Storage::disk(Admin::config('admin.upload.disk'))->url($path); $eTag = md5_file($realPath); + return $this->response()->success(['eTag' => $eTag]); } } @@ -196,18 +198,18 @@ trait UploadTrait $uploadId = request()->get('uploadId', ''); $partList = request()->get('partList', []); - $basePath = Admin::config('admin.upload.tem_directory.' . $type).'/'.$uploadId; + $basePath = Admin::config('admin.upload.tem_directory.'.$type).'/'.$uploadId; $realPath = 'chunk/'.$fileName; //获取分片列表中序号，查看分片是否都完成上传 $partNumberList = Arr::pluck($partList, 'partNumber'); - if(max($partNumberList) === count($partNumberList)){ + if (max($partNumberList) === count($partNumberList)) { //判断是否已存在同名文件，进行重命名 - if(Storage::disk(Admin::config('admin.upload.disk'))->exists($realPath)){ + if (Storage::disk(Admin::config('admin.upload.disk'))->exists($realPath)) { $realPath = 'chunk/(1)'.$fileName; } - for($i = 1; $i<= count($partNumberList); $i++){ + for ($i = 1; $i <= count($partNumberList); $i++) { $_file = Storage::disk(Admin::config('admin.upload.disk'))->get($basePath.'/'.$fileName.'_'.$i); $res = Storage::disk(Admin::config('admin.upload.disk'))->append($realPath, $_file, null); } @@ -216,8 +218,8 @@ trait UploadTrait $value = Storage::disk(Admin::config('admin.upload.disk'))->url($realPath); - return $this->response()->success(['value'=>$value]); - }else{ + return $this->response()->success(['value' => $value]); + } else { return $this->response()->fail(__('admin.upload_file_error')); } } diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php index 9cfa42e..2a56744 100644 --- a/bootstrap/helpers.php +++ b/bootstrap/helpers.php @@ -24,23 +24,28 @@ if (! function_exists('trim_zeros')) { } } -function transformLat($x, $y) { +function transformLat($x, $y) +{ $ret = -100.0 + 2.0 * $x + 3.0 * $y + 0.2 * $y * $y + 0.1 * $x * $y + 0.2 * sqrt(abs($x)); $ret += (20.0 * sin(6.0 * $x * pi()) + 20.0 * sin(2.0 * $x * pi())) * 2.0 / 3.0; $ret += (20.0 * sin($y * pi()) + 40.0 * sin($y / 3.0 * pi())) * 2.0 / 3.0; $ret += (160.0 * sin($y / 12.0 * pi()) + 320 * sin($y * pi() / 30.0)) * 2.0 / 3.0; + return $ret; } -function transformLon($x, $y) { +function transformLon($x, $y) +{ $ret = 300.0 + $x + 2.0 * $y + 0.1 * $x * $x + 0.1 * $x * $y + 0.1 * sqrt(abs($x)); $ret += (20.0 * sin(6.0 * $x * pi()) + 20.0 * sin(2.0 * $x * pi())) * 2.0 / 3.0; $ret += (20.0 * sin($x * pi()) + 40.0 * sin($x / 3.0 * pi())) * 2.0 / 3.0; $ret += (150.0 * sin($x / 12.0 * pi()) + 300.0 * sin($x / 30.0 * pi())) * 2.0 / 3.0; + return $ret; } -function delta($lat, $lon) { +function delta($lat, $lon) +{ $a = 6378245.0; $ee = 0.00669342162296594323; $dLat = transformLat($lon - 105.0, $lat - 35.0); @@ -51,26 +56,32 @@ function delta($lat, $lon) { $sqrtMagic = sqrt($magic); $dLat = ($dLat * 180.0) / (($a * (1 - $ee)) / ($magic * $sqrtMagic) * pi()); $dLon = ($dLon * 180.0) / ($a / $sqrtMagic * cos($radLat) * pi()); - return array('lat' => $dLat, 'lon' => $dLon); + + return ['lat' => $dLat, 'lon' => $dLon]; } -function wgs84ToGcj02($lat, $lon) { +function wgs84ToGcj02($lat, $lon) +{ if (outOfChina($lat, $lon)) { - return array('lat' => $lat, 'lon' => $lon); + return ['lat' => $lat, 'lon' => $lon]; } $d = delta($lat, $lon); - return array('lat' => $lat + $d['lat'], 'lon' => $lon + $d['lon']); + + return ['lat' => $lat + $d['lat'], 'lon' => $lon + $d['lon']]; } -function gcj02ToWgs84($lat, $lon) { +function gcj02ToWgs84($lat, $lon) +{ if (outOfChina($lat, $lon)) { - return array('lat' => $lat, 'lon' => $lon); + return ['lat' => $lat, 'lon' => $lon]; } $d = delta($lat, $lon); - return array('lat' => $lat - $d['lat'], 'lon' => $lon - $d['lon']); + + return ['lat' => $lat - $d['lat'], 'lon' => $lon - $d['lon']]; } -function outOfChina($lat, $lon) { +function outOfChina($lat, $lon) +{ return ($lon < 72.004 || $lon > 137.8347) || ($lat < 0.8293 || $lat > 55.8271); } // function pi() { diff --git a/database/factories/BookFactory.php b/database/factories/BookFactory.php index 9a2a035..62e52c7 100644 --- a/database/factories/BookFactory.php +++ b/database/factories/BookFactory.php @@ -2,10 +2,10 @@ namespace Database\Factories; -use Illuminate\Database\Eloquent\Factories\Factory; -use App\Models\Train\Book; -use App\Models\Keyword; use App\Enums\BookType; +use App\Models\Keyword; +use App\Models\Train\Book; +use Illuminate\Database\Eloquent\Factories\Factory; /** * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Model> @@ -13,6 +13,7 @@ use App\Enums\BookType; class BookFactory extends Factory { protected $model = Book::class; + /** * Define the model's default state. * @@ -29,8 +30,8 @@ class BookFactory extends Factory 'content' => '

富文本 H1

', 'video' => 'https://qiniu.abcdefg.fun/mp4-1.mp4', 'files' => [ - ['id' => '1', 'name' => '1.png', 'url' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', 'value' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', "state" => "uploaded"], - ['id' => '2','name' => '2.png', 'url' => 'https://qiniu.abcdefg.fun/avatar/avatar2.png', 'value' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', "state" => "uploaded"], + ['id' => '1', 'name' => '1.png', 'url' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', 'value' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', 'state' => 'uploaded'], + ['id' => '2', 'name' => '2.png', 'url' => 'https://qiniu.abcdefg.fun/avatar/avatar2.png', 'value' => 'https://qiniu.abcdefg.fun/avatar/avatar.png', 'state' => 'uploaded'], ], ]; } diff --git a/database/factories/QuestionFactory.php b/database/factories/QuestionFactory.php index b4b44f5..9f5c0e8 100644 --- a/database/factories/QuestionFactory.php +++ b/database/factories/QuestionFactory.php @@ -2,9 +2,9 @@ namespace Database\Factories; -use Illuminate\Database\Eloquent\Factories\Factory; -use App\Models\Train\Question; use App\Enums\QuestionCate; +use App\Models\Train\Question; +use Illuminate\Database\Eloquent\Factories\Factory; /** * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Model> @@ -12,6 +12,7 @@ use App\Enums\QuestionCate; class QuestionFactory extends Factory { protected $model = Question::class; + /** * Define the model's default state. * @@ -24,13 +25,14 @@ class QuestionFactory extends Factory $max = 4; $index = []; if ($cate == QuestionCate::Radio) { - $index = [$this->faker->randomElement(range(0, $max- 1))]; - } else if ($cate == QuestionCate::Checkbox) { - $index = $this->faker->randomElements(range(0, $max- 1), $this->faker->numberBetween(2, 4)); + $index = [$this->faker->randomElement(range(0, $max - 1))]; + } elseif ($cate == QuestionCate::Checkbox) { + $index = $this->faker->randomElements(range(0, $max - 1), $this->faker->numberBetween(2, 4)); } - for($i = 0; $i < $max; $i++) { + for ($i = 0; $i < $max; $i++) { array_push($options, ['text' => $this->faker->word, 'is_true' => in_array($i, $index)]); } + return [ 'title' => $this->faker->sentence, 'cate' => $cate, diff --git a/database/migrations/2024_03_27_140744_create_employee_sign_table.php b/database/migrations/2024_03_27_140744_create_employee_sign_table.php index 21550f0..b18738e 100644 --- a/database/migrations/2024_03_27_140744_create_employee_sign_table.php +++ b/database/migrations/2024_03_27_140744_create_employee_sign_table.php @@ -1,9 +1,11 @@ '门店管理', 'icon' => 'material-symbols:store-outline', 'uri' => '/store', - 'order' =>2, + 'order' => 2, 'children' => [ 'stores' => [ 'name' => '门店列表', @@ -50,7 +50,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 1, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'employees' => [ @@ -60,7 +60,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => ['list', 'create', 'delete'], 'order' => 2, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'categories' => [ @@ -127,7 +127,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'children' => [ 'leave' => '离职', - 'export' => '导出' + 'export' => '导出', ], 'order' => 1, ], @@ -152,7 +152,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => ['list', 'view', 'delete'], 'order' => 4, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'repairs' => [ @@ -162,7 +162,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 5, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'holiday' => [ @@ -172,7 +172,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 6, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'overtime' => [ @@ -182,7 +182,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 7, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'business' => [ @@ -192,7 +192,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 8, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], 'promotion' => [ @@ -202,7 +202,7 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'order' => 9, 'children' => [ - 'export' => '导出' + 'export' => '导出', ], ], ], @@ -373,15 +373,15 @@ class AdminPermissionSeeder extends Seeder 'children' => [ 'publish' => '生成考卷', 'cancel' => '取消考试', - ] + ], ], 'papers' => [ 'name' => '考试结果', 'icon' => 'icon-park-outline:upload-logs', 'uri' => '/train/papers', - 'resource' => ['list', 'view'] + 'resource' => ['list', 'view'], ], - ] + ], ], 'agreement' => [ 'name' => '合同管理', @@ -390,14 +390,14 @@ class AdminPermissionSeeder extends Seeder 'resource' => true, 'children' => [ 'download' => '打包下载', - ] + ], ], 'app_versions' => [ 'name' => 'App版本管理', 'icon' => 'ic:twotone-app-shortcut', 'uri' => '/app-versions', 'resource' => true, - 'children' => [] + 'children' => [], ], /* diff --git a/database/seeders/AdminSeeder.php b/database/seeders/AdminSeeder.php index 23ef356..1a9e262 100644 --- a/database/seeders/AdminSeeder.php +++ b/database/seeders/AdminSeeder.php @@ -4,7 +4,6 @@ namespace Database\Seeders; use App\Models\AdminRole; use App\Models\AdminUser; -use App\Models\Employee; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/EmployeeSeeder.php b/database/seeders/EmployeeSeeder.php index 2a28260..3c6f45f 100644 --- a/database/seeders/EmployeeSeeder.php +++ b/database/seeders/EmployeeSeeder.php @@ -7,7 +7,7 @@ use App\Models\EmployeeSign; use App\Models\EmployeeSignLog; use App\Models\Store; use App\Models\Train\{Question}; -use Database\Factories\{EmployeeFactory, QuestionFactory}; +use Database\Factories\EmployeeFactory; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/KeywordSeeder.php b/database/seeders/KeywordSeeder.php index a0108c2..f07ed04 100644 --- a/database/seeders/KeywordSeeder.php +++ b/database/seeders/KeywordSeeder.php @@ -82,7 +82,7 @@ class KeywordSeeder extends Seeder 'key' => 'ledger_item_type', 'name' => '上报数据类型', 'children' => [ - ['key' => 'ledger_item_type_other', 'name' => '其他'] + ['key' => 'ledger_item_type_other', 'name' => '其他'], ], ], [ @@ -99,7 +99,7 @@ class KeywordSeeder extends Seeder 'key' => 'book_category', 'name' => '课件分类', 'children' => ['专业知识', '服务知识', '专业技巧', '企业文化'], - ] + ], ]; $this->insertKeywors($keywords); diff --git a/database/seeders/SettingSeeder.php b/database/seeders/SettingSeeder.php index 1fa1bba..445850d 100644 --- a/database/seeders/SettingSeeder.php +++ b/database/seeders/SettingSeeder.php @@ -2,7 +2,6 @@ namespace Database\Seeders; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; use Slowlyo\OwlAdmin\Services\AdminSettingService; diff --git a/database/seeders/TrainSeeder.php b/database/seeders/TrainSeeder.php index eab67aa..1ffd0d7 100644 --- a/database/seeders/TrainSeeder.php +++ b/database/seeders/TrainSeeder.php @@ -2,10 +2,11 @@ namespace Database\Seeders; -use Illuminate\Database\Console\Seeds\WithoutModelEvents; +use App\Models\Train\Book; +use App\Models\Train\Question; +use Database\Factories\BookFactory; +use Database\Factories\QuestionFactory; use Illuminate\Database\Seeder; -use App\Models\Train\{Book, Question}; -use Database\Factories\{BookFactory, QuestionFactory}; class TrainSeeder extends Seeder {