From 884a5d3573f124254b870c1983469faf8cc2035a Mon Sep 17 00:00:00 2001 From: weiz Date: Mon, 25 Dec 2023 14:14:33 +0800 Subject: [PATCH] ProjectJobType --- .../project/ProjectJobTypeController.php | 115 ++++++++++++++++++ .../lists/project/ProjectJobTypeLists.php | 77 ++++++++++++ .../logic/project/ProjectJobTypeLogic.php | 108 ++++++++++++++++ .../project/ProjectJobTypeValidate.php | 111 +++++++++++++++++ .../project/ProjectPersonnelValidate.php | 5 +- app/common/model/project/ProjectJobType.php | 34 ++++++ app/common/model/project/ProjectPersonnel.php | 4 +- 7 files changed, 450 insertions(+), 4 deletions(-) create mode 100644 app/adminapi/controller/project/ProjectJobTypeController.php create mode 100644 app/adminapi/lists/project/ProjectJobTypeLists.php create mode 100644 app/adminapi/logic/project/ProjectJobTypeLogic.php create mode 100644 app/adminapi/validate/project/ProjectJobTypeValidate.php create mode 100644 app/common/model/project/ProjectJobType.php diff --git a/app/adminapi/controller/project/ProjectJobTypeController.php b/app/adminapi/controller/project/ProjectJobTypeController.php new file mode 100644 index 000000000..b95095b4b --- /dev/null +++ b/app/adminapi/controller/project/ProjectJobTypeController.php @@ -0,0 +1,115 @@ +dataLists(new ProjectJobTypeLists()); + } + + + /** + * @notes 添加工种设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function add() + { + $params = (new ProjectJobTypeValidate())->post()->goCheck('add'); + $result = ProjectJobTypeLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(ProjectJobTypeLogic::getError()); + } + + + /** + * @notes 编辑工种设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function edit() + { + $params = (new ProjectJobTypeValidate())->post()->goCheck('edit'); + $result = ProjectJobTypeLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(ProjectJobTypeLogic::getError()); + } + + + /** + * @notes 删除工种设置 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function delete() + { + $params = (new ProjectJobTypeValidate())->post()->goCheck('delete'); + ProjectJobTypeLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工种设置详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function detail() + { + $params = (new ProjectJobTypeValidate())->goCheck('detail'); + $result = ProjectJobTypeLogic::detail($params); + return $this->data($result); + } + + public function all(): \think\response\Json + { + $data = ProjectJobType::field('id,type_name,type_unit_price,per_daily_living')->select()->toArray(); + return $this->success('请求成功',$data); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/project/ProjectJobTypeLists.php b/app/adminapi/lists/project/ProjectJobTypeLists.php new file mode 100644 index 000000000..f8db95a39 --- /dev/null +++ b/app/adminapi/lists/project/ProjectJobTypeLists.php @@ -0,0 +1,77 @@ + ['type_name'], + ]; + } + + + /** + * @notes 获取工种设置列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function lists(): array + { + return ProjectJobType::where($this->searchWhere) + ->field(['id', 'type_name', 'type_unit_price', 'per_daily_living']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取工种设置数量 + * @return int + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function count(): int + { + return ProjectJobType::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/project/ProjectJobTypeLogic.php b/app/adminapi/logic/project/ProjectJobTypeLogic.php new file mode 100644 index 000000000..bad60b3e3 --- /dev/null +++ b/app/adminapi/logic/project/ProjectJobTypeLogic.php @@ -0,0 +1,108 @@ + $params['type_name'], + 'type_unit_price' => $params['type_unit_price'], + 'per_daily_living' => $params['per_daily_living'], + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑工种设置 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + ProjectJobType::where('id', $params['id'])->update([ + 'type_name' => $params['type_name'], + 'type_unit_price' => $params['type_unit_price'], + 'per_daily_living' => $params['per_daily_living'], + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除工种设置 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public static function delete(array $params): bool + { + return ProjectJobType::destroy($params['id']); + } + + + /** + * @notes 获取工种设置详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public static function detail($params): array + { + return ProjectJobType::field(['id','type_name','type_unit_price','per_daily_living'])->findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/project/ProjectJobTypeValidate.php b/app/adminapi/validate/project/ProjectJobTypeValidate.php new file mode 100644 index 000000000..d65321572 --- /dev/null +++ b/app/adminapi/validate/project/ProjectJobTypeValidate.php @@ -0,0 +1,111 @@ + 'require', + 'type_name' => 'require|unique:'.ProjectJobType::class, + 'type_unit_price' => 'require|float|egt:0', + 'per_daily_living' => 'require|float|egt:0', + ]; + + protected $message = [ + 'id.require' => '缺少必要参数', + 'type_name.require' => '请填写工种名称', + 'type_name.unique' => '工种名称已存在', + 'type_unit_price.require' => '请填写工种单价', + 'type_unit_price.float' => '工种单价必须是数字', + 'type_unit_price.egt' => '工种单价必须大于等于0', + 'per_daily_living.require' => '请填写每日生活费', + 'per_daily_living.float' => '每日生活费必须是数字', + 'per_daily_living.egt' => '每日生活费必须大于等于0', + ]; + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'type_name' => '工种名称', + 'type_unit_price' => '工种单价', + 'per_daily_living' => '每日生活费', + ]; + + /** + * @notes 添加场景 + * @return ProjectJobTypeValidate + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function sceneAdd() + { + return $this->only(['type_name','type_unit_price','per_daily_living']); + } + + + /** + * @notes 编辑场景 + * @return ProjectJobTypeValidate + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function sceneEdit() + { + return $this->only(['id','type_name','type_unit_price','per_daily_living']); + } + + + /** + * @notes 删除场景 + * @return ProjectJobTypeValidate + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return ProjectJobTypeValidate + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/project/ProjectPersonnelValidate.php b/app/adminapi/validate/project/ProjectPersonnelValidate.php index a3b28f50e..30470b2f6 100644 --- a/app/adminapi/validate/project/ProjectPersonnelValidate.php +++ b/app/adminapi/validate/project/ProjectPersonnelValidate.php @@ -17,6 +17,7 @@ namespace app\adminapi\validate\project; use app\common\model\dict\DictData; use app\common\model\project\Project; +use app\common\model\project\ProjectJobType; use app\common\validate\BaseValidate; @@ -135,8 +136,8 @@ class ProjectPersonnelValidate extends BaseValidate public function checkWorkType($value): bool|string { - $dictData = DictData::where('type_value','work_type')->column('value'); - if(!in_array($value,$dictData)){ + $data = ProjectJobType::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ return '工作无效'; } return true; diff --git a/app/common/model/project/ProjectJobType.php b/app/common/model/project/ProjectJobType.php new file mode 100644 index 000000000..7e6da99a1 --- /dev/null +++ b/app/common/model/project/ProjectJobType.php @@ -0,0 +1,34 @@ +column('name','value'); - return $dictData[$data['work_type']]; + $type = ProjectJobType::field('id,type_name')->where('id',$data['work_type'])->findOrEmpty(); + return $type->isEmpty() ? '' : $type['type_name']; } } \ No newline at end of file