From ab2a6931bb04ca77e82fcc863a92fda544333a48 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Sat, 23 Mar 2024 17:01:21 +0800 Subject: [PATCH] update --- .../project/ProjectJobTypeController.php | 205 +++++++++--------- .../logic/project/ProjectJobTypeLogic.php | 197 +++++++++-------- 2 files changed, 207 insertions(+), 195 deletions(-) diff --git a/app/adminapi/controller/project/ProjectJobTypeController.php b/app/adminapi/controller/project/ProjectJobTypeController.php index b95095b4b..a99bbea82 100644 --- a/app/adminapi/controller/project/ProjectJobTypeController.php +++ b/app/adminapi/controller/project/ProjectJobTypeController.php @@ -11,105 +11,110 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - - -namespace app\adminapi\controller\project; - - -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\project\ProjectJobTypeLists; -use app\adminapi\logic\project\ProjectJobTypeLogic; -use app\adminapi\validate\project\ProjectJobTypeValidate; -use app\common\model\project\ProjectJobType; - - -/** - * 工种设置控制器 - * Class ProjectJobTypeController - * @package app\adminapi\controller\project - */ -class ProjectJobTypeController extends BaseAdminController -{ - - - /** - * @notes 获取工种设置列表 - * @return \think\response\Json - * @author likeadmin - * @date 2023/12/25 13:50 - */ - public function lists() - { - return $this->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 + + namespace app\adminapi\controller\project; + + + use app\adminapi\controller\BaseAdminController; + use app\adminapi\lists\project\ProjectJobTypeLists; + use app\adminapi\logic\project\ProjectJobTypeLogic; + use app\adminapi\validate\project\ProjectJobTypeValidate; + use app\common\model\project\ProjectJobType; + + + /** + * 工种设置控制器 + * Class ProjectJobTypeController + * @package app\adminapi\controller\project + */ + class ProjectJobTypeController extends BaseAdminController { - $data = ProjectJobType::field('id,type_name,type_unit_price,per_daily_living')->select()->toArray(); - return $this->success('请求成功',$data); - } - - -} \ No newline at end of file + + + /** + * @notes 获取工种设置列表 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public function lists() + { + return $this->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); + } + + public function datas() + { + return $this->data(ProjectJobTypeLogic::datas()); + } + + + } \ No newline at end of file diff --git a/app/adminapi/logic/project/ProjectJobTypeLogic.php b/app/adminapi/logic/project/ProjectJobTypeLogic.php index bad60b3e3..28be2a171 100644 --- a/app/adminapi/logic/project/ProjectJobTypeLogic.php +++ b/app/adminapi/logic/project/ProjectJobTypeLogic.php @@ -11,98 +11,105 @@ // +---------------------------------------------------------------------- // | author: likeadminTeam // +---------------------------------------------------------------------- - -namespace app\adminapi\logic\project; - - -use app\common\model\project\ProjectJobType; -use app\common\logic\BaseLogic; -use think\facade\Db; - - -/** - * 工种设置逻辑 - * Class ProjectJobTypeLogic - * @package app\adminapi\logic\project - */ -class ProjectJobTypeLogic extends BaseLogic -{ - - - /** - * @notes 添加工种设置 - * @param array $params - * @return bool - * @author likeadmin - * @date 2023/12/25 13:50 - */ - public static function add(array $params): bool - { - Db::startTrans(); - try { - ProjectJobType::create([ - '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 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 + + namespace app\adminapi\logic\project; + + + use app\common\logic\BaseLogic; + use app\common\model\project\ProjectJobType; + use think\facade\Db; + + + /** + * 工种设置逻辑 + * Class ProjectJobTypeLogic + * @package app\adminapi\logic\project + */ + class ProjectJobTypeLogic extends BaseLogic + { + + + /** + * @notes 添加工种设置 + * @param array $params + * @return bool + * @author likeadmin + * @date 2023/12/25 13:50 + */ + public static function add(array $params): bool + { + Db::startTrans(); + try { + ProjectJobType::create([ + '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 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(); + } + + public static function datas() + { + return ProjectJobType::field(['id', 'type_name'])->order(['id' => 'desc'])->select()->each(function ($data) { + $data['projectinfo'] = 'ID：' . $data['id'] . ' / 名称：' . $data['type_name']; + })->toArray(); + } + } \ No newline at end of file