diff --git a/app/adminapi/controller/safety/SafetySuperviseController.php b/app/adminapi/controller/safety/SafetySuperviseController.php new file mode 100644 index 000000000..282620db2 --- /dev/null +++ b/app/adminapi/controller/safety/SafetySuperviseController.php @@ -0,0 +1,108 @@ +dataLists(new SafetySuperviseLists()); + } + + + /** + * @notes 添加安全监督 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function add() + { + $params = (new SafetySuperviseValidate())->post()->goCheck('add'); + $result = SafetySuperviseLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SafetySuperviseLogic::getError()); + } + + + /** + * @notes 编辑安全监督 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function edit() + { + $params = (new SafetySuperviseValidate())->post()->goCheck('edit'); + $result = SafetySuperviseLogic::edit($params,$this->adminId); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SafetySuperviseLogic::getError()); + } + + + /** + * @notes 删除安全监督 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function delete() + { + $params = (new SafetySuperviseValidate())->post()->goCheck('delete'); + SafetySuperviseLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取安全监督详情 + * @return \think\response\Json + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function detail() + { + $params = (new SafetySuperviseValidate())->goCheck('detail'); + $result = SafetySuperviseLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/safety/SafetySuperviseLists.php b/app/adminapi/lists/safety/SafetySuperviseLists.php new file mode 100644 index 000000000..f9661b6b2 --- /dev/null +++ b/app/adminapi/lists/safety/SafetySuperviseLists.php @@ -0,0 +1,86 @@ + ['project_name','name', 'happen_time', 'device_accident'], + + ]; + } + + + /** + * @notes 获取安全监督列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function lists(): array + { + return SafetySupervise::where($this->searchWhere) + ->field(['id', 'org_id', 'dept_id', 'project_name', 'name', 'happen_time', 'device_accident', 'content', 'remark', 'file']) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($item){ + $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']; + return $item; + }) + ->toArray(); + } + + + /** + * @notes 获取安全监督数量 + * @return int + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function count(): int + { + return SafetySupervise::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/safety/SafetySuperviseLogic.php b/app/adminapi/logic/safety/SafetySuperviseLogic.php new file mode 100644 index 000000000..f146f9cea --- /dev/null +++ b/app/adminapi/logic/safety/SafetySuperviseLogic.php @@ -0,0 +1,138 @@ + $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_name' => $params['project_name'], + 'name' => $params['name'], + 'happen_time' => strtotime($params['happen_time']), + 'device_accident' => $params['device_accident'], + 'content' => $params['content'], + 'remark' => $params['remark'], + 'file' => !empty($params['file']) ? $params['file'] : null, + '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 15:11 + */ + public static function edit(array $params,$admin_id): bool + { + Db::startTrans(); + try { + SafetySupervise::where('id', $params['id'])->update([ + 'org_id' => $params['org_id'], + 'dept_id' => $params['dept_id'], + 'project_name' => $params['project_name'], + 'name' => $params['name'], + 'happen_time' => $params['happen_time'], + 'device_accident' => $params['device_accident'], + 'content' => $params['content'], + 'remark' => $params['remark'], + 'file' => !empty($params['file']) ? $params['file'] : null, + '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 15:11 + */ + public static function delete(array $params): bool + { + return SafetySupervise::destroy($params['id']); + } + + + /** + * @notes 获取安全监督详情 + * @param $params + * @return array + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public static function detail($params): array + { + $data = SafetySupervise::field(['id','org_id','dept_id','project_name','name','happen_time','device_accident','content','remark','file','add_user','update_user','create_time','update_time'])->findOrEmpty($params['id'])->toArray(); + $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['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/SafetySuperviseValidate.php b/app/adminapi/validate/safety/SafetySuperviseValidate.php new file mode 100644 index 000000000..25ba0de4f --- /dev/null +++ b/app/adminapi/validate/safety/SafetySuperviseValidate.php @@ -0,0 +1,132 @@ + 'require', + 'org_id' => 'require|checkOrg', + 'dept_id' => 'require|checkDept', + 'happen_time' => 'date', + 'file' => 'checkFile' + ]; + + protected $message = [ + 'id.require' => '缺少必要参数', + 'org_id.require' => '请选择组织', + 'dept_id.require' => '请选择部门', + 'happen_time.date' => '发生时间格式错误', + ]; + + + + /** + * @notes 添加场景 + * @return SafetySuperviseValidate + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function sceneAdd() + { + return $this->only(['org_id','dept_id','project_name','name','happen_time','device_accident','content','remark','file']); + } + + + /** + * @notes 编辑场景 + * @return SafetySuperviseValidate + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function sceneEdit() + { + return $this->only(['id','org_id','dept_id','project_name','name','happen_time','device_accident','content','remark','file']); + } + + + /** + * @notes 删除场景 + * @return SafetySuperviseValidate + * @author likeadmin + * @date 2023/12/19 15:11 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SafetySuperviseValidate + * @author likeadmin + * @date 2023/12/19 15:11 + */ + 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 checkFile($value): bool|string + { + if($value != ''){ + $file = json_decode($value,true); + if(empty($file)){ + return '附件必须是json数组'; + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/safety/SafetySupervise.php b/app/common/model/safety/SafetySupervise.php new file mode 100644 index 000000000..290471871 --- /dev/null +++ b/app/common/model/safety/SafetySupervise.php @@ -0,0 +1,42 @@ +