pdkj
/
store-manage
generated from liutk/owl-admin-base
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复编码风格

main
Jing Li 2024-05-20 10:14:15 +08:00
parent 8a317876e0
commit 6b94eec365
127 changed files with 624 additions and 520 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Admin/Controllers/AdminController.php
View File

@ -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);
}

16
app/Admin/Controllers/AgreementController.php
View File

@ -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;
/**
* 合同管理
@ -145,6 +146,7 @@ class AgreementController extends AdminController
$zip->addFile(Storage::disk('public')->path($path), data_get($info, 'basename'));
}
$zip->close();
return $this->response()->success(['path' => $filename]);
}
}

1
app/Admin/Controllers/AppVersionController.php
View File

@ -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;

8
app/Admin/Controllers/CockpitController.php
View File

@ -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个月
@ -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个月
@ -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,

1
app/Admin/Controllers/Finance/CommissionIncomeController.php
View File

@ -93,7 +93,6 @@ class CommissionIncomeController extends AdminController
* 导出按钮
*
* @param bool $disableSelectedItem
*
* @return \Slowlyo\OwlAdmin\Renderers\Service
*/
protected function exportAction($disableSelectedItem = false)

1
app/Admin/Controllers/Finance/SalesStatisticController.php
View File

@ -107,7 +107,6 @@ class SalesStatisticController extends AdminController
* 导出按钮
*
* @param bool $disableSelectedItem
*
* @return \Slowlyo\OwlAdmin\Renderers\Service
*/
protected function exportAction($disableSelectedItem = false)

1
app/Admin/Controllers/Finance/StoreStatisticController.php
View File

@ -72,7 +72,6 @@ class StoreStatisticController extends AdminController
* 导出按钮
*
* @param bool $disableSelectedItem
*
* @return \Slowlyo\OwlAdmin\Renderers\Service
*/
protected function exportAction($disableSelectedItem = false)

1
app/Admin/Controllers/HomeController.php
View File

@ -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;

2
app/Admin/Controllers/Hr/EmployeeController.php
View File

@ -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'),

4
app/Admin/Controllers/Hr/PromotionController.php
View File

@ -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;

2
app/Admin/Controllers/SettingController.php
View File

@ -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('允许打卡的距离(米)'),
]),
])
);

1
app/Admin/Controllers/Store/EmployeeController.php
View File

@ -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'),

1
app/Admin/Controllers/Store/StoreProfitRatioLogController.php
View File

@ -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;
/**

3
app/Admin/Controllers/System/WorkflowController.php
View File

@ -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;

5
app/Admin/Controllers/Train/BookController.php
View File

@ -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;
/**
* 课件管理
@ -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));
}
}

19
app/Admin/Controllers/Train/ExaminationController.php
View File

@ -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;
/**
* 考试管理
@ -95,7 +97,7 @@ class ExaminationController extends AdminController
->valueField('id')
->multiple(true)
->autoFill([
'questions' => '${items}'
'questions' => '${items}',
])
->value('${questions}')
->size('lg')
@ -151,13 +153,14 @@ 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 {
@ -167,9 +170,11 @@ class ExaminationController extends AdminController
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
@ -186,9 +191,11 @@ class ExaminationController extends AdminController
return $this->response()->fail($this->service->getError());
}
DB::commit();
return $this->response()->success();
} catch (\Exception $e) {
DB::rollBack();
return $this->response()->fail($e->getMessage());
}
}

4
app/Admin/Controllers/Train/PaperController.php
View File

@ -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]);
}
}

3
app/Admin/Controllers/Train/QuestionController.php
View File

@ -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());

4
app/Admin/Filters/AgreementFilter.php
View File

@ -19,8 +19,8 @@ class AgreementFilter extends ModelFilter
'invitor_search' => 'search',
],
'workflow' => [
'check_status' => 'check_status'
]
'check_status' => 'check_status',
],
];
public function employeeId($key)

2
app/Admin/Filters/EmployeeFilter.php
View File

@ -12,7 +12,7 @@ class EmployeeFilter extends ModelFilter
'province_code' => 'province_code',
'province_code' => 'province_code',
'city_code' => 'city_code',
]
],
];
protected $drop_id = false;

4
app/Admin/Filters/EmployeePromotionFilter.php
View File

@ -22,8 +22,8 @@ class EmployeePromotionFilter extends ModelFilter
'invitor_search' => 'search',
],
'workflow' => [
'check_status' => 'check_status'
]
'check_status' => 'check_status',
],
];
public function employeeId($key)

4
app/Admin/Filters/OvertimeApplyFilter.php
View File

@ -18,8 +18,8 @@ class OvertimeApplyFilter extends ModelFilter
'employee_search' => 'search',
],
'workflow' => [
'check_status' => 'check_status'
]
'check_status' => 'check_status',
],
];
public function employeeId($key)

2
app/Admin/Filters/StoreFilter.php
View File

@ -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
{

1
app/Admin/Filters/TrainExaminationFilter.php
View File

@ -10,6 +10,7 @@ class TrainExaminationFilter extends ModelFilter
public function search($key)
{
$condition = '%'.$key.'%';
return $this->where('name', 'like', $condition);
}

1
app/Admin/Filters/TrianPaperFilter.php
View File

@ -2,7 +2,6 @@
namespace App\Admin\Filters;
use Carbon\Carbon;
use EloquentFilter\ModelFilter;
class TrianPaperFilter extends ModelFilter

1
app/Admin/Filters/TrianQuestionFilter.php
View File

@ -10,6 +10,7 @@ class TrianQuestionFilter extends ModelFilter
public function search($key)
{
$condition = '%'.$key.'%';
return $this->where('title', 'like', $condition);
}

2
app/Admin/Middleware/CheckPermission.php
View File

@ -21,7 +21,7 @@ class CheckPermission
'/finish_chunk_upload_file',
'/upload_file',
'/upload_image',
'/upload_rich'
'/upload_rich',
];
/**

12
app/Admin/Services/AgreementService.php
View File

@ -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
{
@ -85,6 +84,7 @@ class AgreementService extends BaseService
}
$data['images'] = $images;
}
return $data;
}
@ -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;
}
}

4
app/Admin/Services/AppVersionService.php
View File

@ -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;
}
}

3
app/Admin/Services/BaseService.php
View File

@ -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;
}

7
app/Admin/Services/EmployeePromotionService.php
View File

@ -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
{
@ -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;
}
}

12
app/Admin/Services/EmployeeService.php
View File

@ -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
{

13
app/Admin/Services/EmployeeSignRepairService.php
View File

@ -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
{
@ -97,7 +97,7 @@ class EmployeeSignRepairService extends BaseService
if (EmployeeSignLog::filter([
'date' => $data['date'],
'employee_id' => $data['employee_id'],
'sign_time' => $data['sign_time']
'sign_time' => $data['sign_time'],
])->exists()) {
return '已经补过卡了';
}
@ -120,6 +120,7 @@ class EmployeeSignRepairService extends BaseService
foreach ($list as $item) {
$item->delete();
}
return true;
}
}

15
app/Admin/Services/EmployeeSignService.php
View File

@ -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();
@ -96,7 +102,7 @@ class EmployeeSignService extends BaseService
* @param SignTime $time 上班/下班 打卡
* @param mixed $date 打卡时间
* @param array $options {type: 正常/外勤 打卡, remarks: 备注, position: 位置}
* @return boolean
* @return bool
*/
public function signDay(Employee $user, SignTime $time, $date = '', array $options = [])
{
@ -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();
}

7
app/Admin/Services/HolidayApplyService.php
View File

@ -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
{
@ -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;
}
}

7
app/Admin/Services/OfficalBusinessService.php
View File

@ -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
{
@ -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;
}
}

6
app/Admin/Services/OvertimeApplyService.php
View File

@ -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
{
@ -128,6 +129,7 @@ class OvertimeApplyService extends BaseService
foreach ($list as $item) {
$item->delete();
}
return true;
}
}

2
app/Admin/Services/Plan/PlanService.php
View File

@ -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;
}

6
app/Admin/Services/Train/BookService.php
View File

@ -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
{
@ -36,6 +37,7 @@ class BookService extends BaseService
if ($validator->fails()) {
return $validator->errors()->first();
}
return true;
}
}

7
app/Admin/Services/Train/ExaminationService.php
View File

@ -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
@ -66,6 +65,7 @@ class ExaminationService extends BaseService
$data['total_questions'] = $totalQuestions;
$data['total_score'] = $totalScore;
}
return $data;
}
@ -79,6 +79,7 @@ class ExaminationService extends BaseService
foreach ($examination->questions as $question) {
$question['options'] = array_map(function ($option) {
$option['selected'] = false;
return $option;
}, $question['options']);
array_push($questions, $question);

8
app/Admin/Services/Train/PaperService.php
View File

@ -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
{
@ -19,9 +17,8 @@ class PaperService extends BaseService
/**
* 答题
*
* @param Paper $paper
* @param array $answers [[0, 1], [1], [2, 3]]
* @return boolean
* @return bool
*/
public function answer(Paper $paper, array $answers)
{
@ -52,5 +49,4 @@ class PaperService extends BaseService
return true;
}
}

5
app/Admin/Services/Train/QuestionService.php
View File

@ -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
{
@ -26,6 +24,7 @@ class QuestionService extends BaseService
}
$data['options'] = $options;
}
return $data;
}
}

4
app/Admin/Services/WorkFlowService.php
View File

@ -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)

2
app/Console/Commands/EmployeeSign.php
View File

@ -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
{

2
app/Console/Commands/TaskLedgerGenerateCommand.php
View File

@ -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'),

3
app/Enums/CheckStatus.php
View File

@ -46,8 +46,9 @@ enum CheckStatus: int
self::Success->value => '已通过',
self::Fail->value => '未通过',
// self::Cancel->value => '已取消',
]
],
];
return data_get($maps, $index);
}

3
app/Events/WorkflowCheckFailed.php
View File

@ -16,5 +16,6 @@ class WorkflowCheckFailed implements ShouldDispatchAfterCommit
*/
public function __construct(
public WorkflowCheck $workflowCheck
) {}
) {
}
}

3
app/Events/WorkflowCheckNext.php
View File

@ -16,5 +16,6 @@ class WorkflowCheckNext implements ShouldDispatchAfterCommit
*/
public function __construct(
public WorkflowLog $workflowLog,
) {}
) {
}
}

3
app/Events/WorkflowCheckSuccess.php
View File

@ -16,5 +16,6 @@ class WorkflowCheckSuccess implements ShouldDispatchAfterCommit
*/
public function __construct(
public WorkflowCheck $workflowCheck
) {}
) {
}
}

5
app/Exceptions/Handler.php
View File

@ -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;
});
}

1
app/Http/Controllers/Api/Account/StorePerformanceController.php
View File

@ -29,6 +29,7 @@ class StorePerformanceController extends Controller
/**
* 当月的业绩指标任务
*
* @var \App\Models\TaskPerformance
*/
$taskPerformance = TaskPerformance::where('store_id', $user->store_id)

6
app/Http/Controllers/Api/AgreementController.php
View File

@ -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;
@ -53,6 +54,7 @@ class AgreementController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -76,6 +78,7 @@ class AgreementController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -95,6 +98,7 @@ class AgreementController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();

12
app/Http/Controllers/Api/Auth/UserController.php
View File

@ -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)
{
@ -57,6 +58,7 @@ class UserController extends Controller
DB::rollback();
throw new RuntimeException($e->getMessage());
}
return response('', Response::HTTP_OK);
}

19
app/Http/Controllers/Api/Hr/EmployeeController.php
View File

@ -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;
/**
* 员工管理
@ -53,6 +54,7 @@ class EmployeeController extends Controller
DB::rollback();
throw new RuntimeException($e->getMessage());
}
return response('', Response::HTTP_CREATED);
}
@ -70,6 +72,7 @@ class EmployeeController extends Controller
DB::rollback();
throw new RuntimeException($e->getMessage());
}
return response('', Response::HTTP_OK);
}
@ -86,6 +89,7 @@ class EmployeeController extends Controller
DB::rollback();
throw new RuntimeException($e->getMessage());
}
return response('', Response::HTTP_OK);
}
@ -106,6 +110,7 @@ class EmployeeController extends Controller
DB::rollback();
throw new RuntimeException($e->getMessage());
}
return response('', Response::HTTP_OK);
}
}

6
app/Http/Controllers/Api/Hr/HolidayController.php
View File

@ -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;
@ -57,6 +58,7 @@ class HolidayController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -80,6 +82,7 @@ class HolidayController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -99,6 +102,7 @@ class HolidayController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();

6
app/Http/Controllers/Api/Hr/OfficalBusinessController.php
View File

@ -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;
@ -54,6 +55,7 @@ class OfficalBusinessController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -77,6 +79,7 @@ class OfficalBusinessController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -96,6 +99,7 @@ class OfficalBusinessController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();

6
app/Http/Controllers/Api/Hr/OvertimeController.php
View File

@ -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;
@ -69,6 +70,7 @@ class OvertimeController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -107,6 +109,7 @@ class OvertimeController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -126,6 +129,7 @@ class OvertimeController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();

7
app/Http/Controllers/Api/Hr/PromotionController.php
View File

@ -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);
}
@ -88,6 +90,7 @@ class PromotionController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -122,6 +125,7 @@ class PromotionController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();
@ -141,6 +145,7 @@ class PromotionController extends Controller
}
DB::commit();
return response()->noContent();
} catch (\Exception $e) {
DB::rollBack();

18
app/Http/Controllers/Api/Hr/SignController.php
View File

@ -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;
/**
* 考勤打卡
@ -163,6 +166,7 @@ class SignController extends Controller
throw new RuntimeException($service->getError());
}
DB::commit();
return response('', Response::HTTP_OK);
} catch (\Exception $e) {
DB::rollBack();

12
app/Http/Controllers/Api/Hr/SignRepairController.php
View File

@ -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);
}
@ -47,6 +50,7 @@ class SignRepairController extends Controller
}
DB::commit();
return response('', Response::HTTP_OK);
} catch (\Exception $e) {
DB::rollBack();
@ -80,6 +84,7 @@ class SignRepairController extends Controller
}
DB::commit();
return response('', Response::HTTP_OK);
} catch (\Exception $e) {
DB::rollBack();
@ -99,6 +104,7 @@ class SignRepairController extends Controller
}
DB::commit();
return response('', Response::HTTP_OK);
} catch (\Exception $e) {
DB::rollBack();

3
app/Http/Controllers/Api/LedgerController.php
View File

@ -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,

5
app/Http/Controllers/Api/MessageController.php
View File

@ -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(),
],
];
}

18
app/Http/Controllers/Api/ReimbursementController.php
View File

@ -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);
}
@ -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' => '未通过原因必填',
]);
@ -178,11 +183,12 @@ class ReimbursementController extends Controller
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();

1
app/Http/Controllers/Api/TaskController.php
View File

@ -63,6 +63,7 @@ MySQL;
return TaskResource::collection(
$tasks->through(function ($task) {
$task->taskable->setRelation('task', $task->withoutRelations());
return $task;
})
);

4
app/Http/Controllers/Api/Train/BookController.php
View File

@ -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;
/**
* 培训-课件

15
app/Http/Controllers/Api/Train/ExaminationController.php
View File

@ -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;
/**
* 培训-考试
@ -39,7 +39,7 @@ 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);
@ -51,6 +51,7 @@ class ExaminationController extends Controller
}
DB::commit();
return TrainPaperResource::make($info);
} catch (\Exception $e) {
DB::rollBack();

10
app/Http/Controllers/Api/WorkflowController copy.php
View File

@ -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;
@ -151,6 +151,7 @@ class WorkflowController extends Controller
}
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' => '未通过原因必填',
]);
@ -188,11 +189,12 @@ class WorkflowController extends Controller
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();

12
app/Http/Controllers/Api/WorkflowController.php
View File

@ -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;
@ -84,6 +86,7 @@ MySQL;
}
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();

2
app/Http/Middleware/CheckUserRole.php
View File

@ -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
{
@ -28,6 +27,7 @@ class CheckUserRole
if (! $hasPermissions) {
throw new \App\Exceptions\RuntimeException('没有权限');
}
return $next($request);
}
}

2
app/Http/Resources/HolidayApplyResource.php
View File

@ -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'),
];
}
}

2
app/Http/Resources/OfficalBusinessResource.php
View File

@ -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'),
];
}
}

1
app/Http/Resources/TaskHygieneResource.php
View File

@ -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
{

6
app/Http/Resources/TaskResource.php
View File

@ -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,

2
app/Http/Resources/TrainPaperResource.php
View File

@ -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,
];
}
}

3
app/Http/Resources/WorkflowCheckResource.php
View File

@ -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,

1
app/Http/Resources/WorkflowLogResource.php
View File

@ -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

9
app/Listeners/CreateWorkflowCheckFailedMessage.php
View File

@ -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.

3
app/Listeners/CreateWorkflowCheckNextMessage.php
View File

@ -19,7 +19,8 @@ class CreateWorkflowCheckNextMessage implements ShouldQueue
*/
public function __construct(
public MessageService $messageService,
) {}
) {
}
/**
* Handle the event.

3
app/Listeners/CreateWorkflowCheckSuccessMessage.php
View File

@ -17,7 +17,8 @@ class CreateWorkflowCheckSuccessMessage implements ShouldQueue
*/
public function __construct(
public MessageService $messageService,
) {}
) {
}
/**
* Handle the event.

7
app/Models/Agreement.php
View File

@ -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'];

4
app/Models/AppVersion.php
View File

@ -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;
},
);

6
app/Models/Employee.php
View File

@ -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;
/**
* 员工
@ -136,7 +135,6 @@ class Employee extends Model implements AuthenticatableContract
/**
* 用户身份
* user: 普通员工, store: 店长, admin: 管理员, store_user: 店员
* @return array
*/
public function userRole(): array
{

1
app/Models/EmployeePromotion.php
View File

@ -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;
/**
* 员工升职申请

6
app/Models/EmployeeSignRepair.php
View File

@ -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;
/**
* 补卡申请

3
app/Models/OvertimeApply.php
View File

@ -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;

2
app/Models/Plan.php
View File

@ -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,

3
app/Models/PlanLedger.php
View File

@ -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');
}
}

2
app/Models/Store.php
View File

@ -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

2
app/Models/StoreProfitRatioLog.php
View File

@ -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',

2
app/Models/Task.php
View File

@ -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,

2
app/Models/TaskHygiene.php
View File

@ -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',

2
app/Models/TaskLedger.php
View File

@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne;
class TaskLedger extends Model
{
use HasFactory, HasDateTimeFormatter;
use HasDateTimeFormatter, HasFactory;
protected $appends = [
'task_status',

2
app/Models/TaskPerformance.php
View File

@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Relations\MorphOne;
class TaskPerformance extends Model
{
use HasFactory, HasDateTimeFormatter;
use HasDateTimeFormatter, HasFactory;
protected $appends = [
'task_status',

4
app/Models/Train/Book.php
View File

@ -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 Book extends Model
{
use HasDateTimeFormatter, Filterable;
use Filterable, HasDateTimeFormatter;
protected $table = 'train_books';

4
app/Models/Train/Examination.php
View File

@ -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';

6
app/Models/Train/Paper.php
View File

@ -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';

4
app/Models/Train/Question.php
View File

@ -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';

3
app/Models/WorkflowCheck.php
View File

@ -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;

1
app/Models/WorkflowLog.php
View File

@ -43,6 +43,7 @@ class WorkflowLog extends Model
array_push($checkValue, $user->store_id.'-'.$item->key);
}
}
return $builder->whereIn('check_value', $checkValue);
}

2
app/Providers/AppServiceProvider.php
View File

@ -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
{

Some files were not shown because too many files have changed in this diff Show More