From 247d909cda00ac9c8f9bf32bc3893d4536f7be71 Mon Sep 17 00:00:00 2001 From: weiz Date: Tue, 19 Dec 2023 16:54:01 +0800 Subject: [PATCH] SafetyModify --- .../safety/SafetyModifyController.php | 108 +++++++++++++ .../lists/safety/SafetyModifyLists.php | 91 +++++++++++ .../logic/safety/SafetyModifyLogic.php | 149 ++++++++++++++++++ .../validate/safety/SafetyModifyValidate.php | 142 +++++++++++++++++ app/common/model/safety/SafetyModify.php | 37 +++++ 5 files changed, 527 insertions(+) create mode 100644 app/adminapi/controller/safety/SafetyModifyController.php create mode 100644 app/adminapi/lists/safety/SafetyModifyLists.php create mode 100644 app/adminapi/logic/safety/SafetyModifyLogic.php create mode 100644 app/adminapi/validate/safety/SafetyModifyValidate.php create mode 100644 app/common/model/safety/SafetyModify.php diff --git a/app/adminapi/controller/safety/SafetyModifyController.php b/app/adminapi/controller/safety/SafetyModifyController.php new file mode 100644 index 000000000..297dcf782 --- /dev/null +++ b/app/adminapi/controller/safety/SafetyModifyController.php @@ -0,0 +1,108 @@ +dataLists(new SafetyModifyLists()); + } + + + /** + * @notes 添加安全整改 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function add() + { + $params = (new SafetyModifyValidate())->post()->goCheck('add'); + $result = SafetyModifyLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SafetyModifyLogic::getError()); + } + + + /** + * @notes 编辑安全整改 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function edit() + { + $params = (new SafetyModifyValidate())->post()->goCheck('edit'); + $result = SafetyModifyLogic::edit($params,$this->adminId); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SafetyModifyLogic::getError()); + } + + + /** + * @notes 删除安全整改 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function delete() + { + $params = (new SafetyModifyValidate())->post()->goCheck('delete'); + SafetyModifyLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取安全整改详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function detail() + { + $params = (new SafetyModifyValidate())->goCheck('detail'); + $result = SafetyModifyLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/safety/SafetyModifyLists.php b/app/adminapi/lists/safety/SafetyModifyLists.php new file mode 100644 index 000000000..0d6407d13 --- /dev/null +++ b/app/adminapi/lists/safety/SafetyModifyLists.php @@ -0,0 +1,91 @@ + ['check_date', 'modify_term'], + '%like%' => ['check_nature', 'check_user', 'check_company', 'modify_company', 'modify_user', 'resp_user'], + + ]; + } + + + /** + * @notes 获取安全整改列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function lists(): array + { + return SafetyModify::where($this->searchWhere) + ->field(['id', 'org_id', 'dept_id', 'project_id', 'check_nature', 'check_date', 'check_user', 'check_company', 'check_item', 'check_result', 'modify_term', 'modify_company', 'modify_user', 'safety_hazard', 'resp_user']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($item){ + $project = Project::field('name,project_code')->where('id',$item['project_id'])->findOrEmpty(); + $org = Orgs::field('name')->where('id',$item['org_id'])->findOrEmpty(); + $dept = Dept::field('name')->where('id',$item['dept_id'])->findOrEmpty(); + $item['org_name'] = $org['name']; + $item['dept_name'] = $dept['name']; + $item['project_name'] = $project['name']; + $item['project_code'] = $project['project_code']; + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取安全整改数量 + * @return int + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function count(): int + { + return SafetyModify::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/safety/SafetyModifyLogic.php b/app/adminapi/logic/safety/SafetyModifyLogic.php new file mode 100644 index 000000000..b476911ad --- /dev/null +++ b/app/adminapi/logic/safety/SafetyModifyLogic.php @@ -0,0 +1,149 @@ + $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_id' => $params['project_id'], + 'check_nature' => $params['check_nature'], + 'check_date' => strtotime($params['check_date']), + 'check_user' => $params['check_user'], + 'check_company' => $params['check_company'], + 'check_item' => $params['check_item'], + 'check_result' => $params['check_result'], + 'modify_term' => $params['modify_term'], + 'modify_company' => $params['modify_company'], + 'modify_user' => $params['modify_user'], + 'safety_hazard' => $params['safety_hazard'], + 'resp_user' => $params['resp_user'], + 'add_user' => $admin_id, + 'update_user' => $admin_id, + ]); + 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/19 16:40 + */ + public static function edit(array $params,$admin_id): bool + { + Db::startTrans(); + try { + SafetyModify::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_id' => $params['project_id'], + 'check_nature' => $params['check_nature'], + 'check_date' => strtotime($params['check_date']), + 'check_user' => $params['check_user'], + 'check_company' => $params['check_company'], + 'check_item' => $params['check_item'], + 'check_result' => $params['check_result'], + 'modify_term' => $params['modify_term'], + 'modify_company' => $params['modify_company'], + 'modify_user' => $params['modify_user'], + 'safety_hazard' => $params['safety_hazard'], + 'resp_user' => $params['resp_user'], + 'update_user' => $admin_id, + 'update_time' => time() + ]); + 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/19 16:40 + */ + public static function delete(array $params): bool + { + return SafetyModify::destroy($params['id']); + } + + + /** + * @notes 获取安全整改详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public static function detail($params): array + { + $data = SafetyModify::findOrEmpty($params['id'])->toArray(); + $project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); + $org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); + $dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty(); + $admin = Admin::where('id','in',[$data['add_user'],$data['update_user']])->column('name','id'); + $data['org_name'] = $org['name']; + $data['dept_name'] = $dept['name']; + $data['project_name'] = $project['name']; + $data['project_code'] = $project['project_code']; + $data['add_user_name'] = $admin[$data['add_user']]; + $data['update_user_name'] = $admin[$data['update_user']]; + return $data; + } +} \ No newline at end of file diff --git a/app/adminapi/validate/safety/SafetyModifyValidate.php b/app/adminapi/validate/safety/SafetyModifyValidate.php new file mode 100644 index 000000000..b8ed28e60 --- /dev/null +++ b/app/adminapi/validate/safety/SafetyModifyValidate.php @@ -0,0 +1,142 @@ + 'require', + 'org_id' => 'require|checkOrg', + 'dept_id' => 'require|checkDept', + 'project_id' => 'require|checkProject', + 'check_date' => 'date', + ]; + + protected $message = [ + 'id.require' => '缺少必要参数', + 'org_id.require' => '请选择组织', + 'dept_id.require' => '请选择部门', + 'project_id.require' => '请选择项目', + 'check_date.date' => '检查日期格式错误', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'org_id' => '组织id', + 'dept_id' => '部门id', + 'project_id' => '项目id', + 'add_user' => '添加人', + 'update_user' => '更新人', + ]; + + + /** + * @notes 添加场景 + * @return SafetyModifyValidate + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SafetyModifyValidate + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SafetyModifyValidate + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SafetyModifyValidate + * @author likeadmin + * @date 2023/12/19 16:40 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkOrg($value): bool|string + { + $data = Orgs::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '组织不存在'; + } + return true; + } + + public function checkDept($value,$rule,$data): bool|string + { + $dept = Dept::where('id',$value)->findOrEmpty(); + if($dept->isEmpty()){ + return '部门不存在'; + } + if($dept['org_id'] != $data['org_id']){ + return '部门不属于当前选择的组织'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = Project::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/safety/SafetyModify.php b/app/common/model/safety/SafetyModify.php new file mode 100644 index 000000000..ad4b978fc --- /dev/null +++ b/app/common/model/safety/SafetyModify.php @@ -0,0 +1,37 @@ +