From 2e7dc28f53b2f77739ba6bbb6b99ad602e897e65 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Fri, 1 Mar 2024 16:12:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8E=B0=E5=9C=BA=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E8=AD=A6=E7=A4=BA=E6=A0=87=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...SupervisionSafetyWarningSignController.php | 108 +++++++++++++++ .../SupervisionSafetyWarningSignLists.php | 81 +++++++++++ .../SupervisionSafetyWarningSignLogic.php | 121 ++++++++++++++++ .../SupervisionInspectionLogic.php | 5 + .../SupervisionSafetyWarningSignValidate.php | 131 ++++++++++++++++++ .../SupervisionSafetyWarningSign.php | 41 ++++++ 6 files changed, 487 insertions(+) create mode 100644 app/adminapi/controller/supervision_dangerous/SupervisionSafetyWarningSignController.php create mode 100644 app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php create mode 100644 app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php create mode 100644 app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php create mode 100644 app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php diff --git a/app/adminapi/controller/supervision_dangerous/SupervisionSafetyWarningSignController.php b/app/adminapi/controller/supervision_dangerous/SupervisionSafetyWarningSignController.php new file mode 100644 index 000000000..3357545c3 --- /dev/null +++ b/app/adminapi/controller/supervision_dangerous/SupervisionSafetyWarningSignController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionSafetyWarningSignLists()); + } + + + /** + * @notes 添加工程监理--现场安全警示标志 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function add() + { + $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('add'); + $result = SupervisionSafetyWarningSignLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionSafetyWarningSignLogic::getError()); + } + + + /** + * @notes 编辑工程监理--现场安全警示标志 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function edit() + { + $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('edit'); + $result = SupervisionSafetyWarningSignLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionSafetyWarningSignLogic::getError()); + } + + + /** + * @notes 删除工程监理--现场安全警示标志 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function delete() + { + $params = (new SupervisionSafetyWarningSignValidate())->post()->goCheck('delete'); + SupervisionSafetyWarningSignLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--现场安全警示标志详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function detail() + { + $params = (new SupervisionSafetyWarningSignValidate())->goCheck('detail'); + $result = SupervisionSafetyWarningSignLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php b/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php new file mode 100644 index 000000000..136042fae --- /dev/null +++ b/app/adminapi/lists/supervision_dangerous/SupervisionSafetyWarningSignLists.php @@ -0,0 +1,81 @@ + ['project_id'], + '%like%' => ['check_user', 'check_area'], + ]; + } + + + /** + * @notes 获取工程监理--现场安全警示标志列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function lists(): array + { + return SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--现场安全警示标志数量 + * @return int + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function count(): int + { + return SupervisionSafetyWarningSign::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php b/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php new file mode 100644 index 000000000..1cbae36ba --- /dev/null +++ b/app/adminapi/logic/supervision_dangerous/SupervisionSafetyWarningSignLogic.php @@ -0,0 +1,121 @@ + $params['project_id'], + 'check_user' => $params['check_user'], + 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, + 'check_area' => $params['check_area'], + 'problem_desc' => $params['problem_desc'], + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + ]); + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 编辑工程监理--现场安全警示标志 + * @param array $params + * @return bool + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionSafetyWarningSign::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'check_user' => $params['check_user'], + 'check_date' => !empty($params['check_date']) ? strtotime($params['check_date']) : 0, + 'check_area' => $params['check_area'], + 'problem_desc' => $params['problem_desc'], + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + '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 2024/03/01 15:41 + */ + public static function delete(array $params): bool + { + return SupervisionSafetyWarningSign::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--现场安全警示标志详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public static function detail($params): array + { + $data = SupervisionSafetyWarningSign::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php b/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php index 2aceaafc1..da2ee479b 100644 --- a/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionInspectionLogic.php @@ -107,6 +107,7 @@ class SupervisionInspectionLogic extends BaseLogic */ public static function edit(array $params,$admin_id): bool { + $data = SupervisionInspection::field('check_item_detail_ids')->where('id',$params['id'])->findOrEmpty(); Db::startTrans(); try { SupervisionInspection::where('id', $params['id'])->update([ @@ -127,6 +128,10 @@ class SupervisionInspectionLogic extends BaseLogic 'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'update_time' => time(), ]); + if(json_encode($data['check_item_detail_ids']) != json_encode($params['check_item_detail_ids'])){ + $supervision_inspection_result_ids = SupervisionInspectionResult::where('inspection_id',$params['id'])->column('id'); + SupervisionInspectionResult::where('id','in',$supervision_inspection_result_ids)->delete(); + } if(!empty($params['inspection_result'])){ foreach($params['inspection_result'] as $v){ if(!empty($v['id'])){ diff --git a/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php b/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php new file mode 100644 index 000000000..2f618b533 --- /dev/null +++ b/app/adminapi/validate/supervision_dangerous/SupervisionSafetyWarningSignValidate.php @@ -0,0 +1,131 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'check_user' => 'require', + 'check_date' => 'require|dateFormat:Y-m-d', + 'check_area' => 'require', + 'annex' => 'checkAnnex', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'check_user' => '检查人', + 'check_date' => '检查日期', + 'check_area' => '检查地点', + 'problem_desc' => '问题描述', + 'remark' => '备注', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionSafetyWarningSignValidate + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionSafetyWarningSignValidate + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionSafetyWarningSignValidate + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionSafetyWarningSignValidate + * @author likeadmin + * @date 2024/03/01 15:41 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionSafetyWarningSign::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkProject($value): bool|string + { + $data = SupervisionProject::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '项目信息不存在'; + } + return true; + } + + public function checkAnnex($value): bool|string + { + if(!empty($value) && $value != '' && !is_array($value)){ + return '附件格式错误'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php b/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php new file mode 100644 index 000000000..8a5206562 --- /dev/null +++ b/app/common/model/supervision_dangerous/SupervisionSafetyWarningSign.php @@ -0,0 +1,41 @@ +