From 4e70eb134c9e397ca6506026faa05510f184544c Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 27 Feb 2024 16:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AA=8C=E6=94=B6=E7=99=BB?= =?UTF-8?q?=E8=AE=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SupervisionAcceptController.php | 108 +++++++++ .../SupervisionAcceptProblemController.php | 108 +++++++++ .../SupervisionAcceptResultController.php | 108 +++++++++ .../SupervisionAcceptLists.php | 94 ++++++++ .../SupervisionAcceptProblemLists.php | 76 ++++++ .../SupervisionAcceptResultLists.php | 79 ++++++ .../SupervisionAcceptLogic.php | 222 +++++++++++++++++ .../SupervisionAcceptProblemLogic.php | 111 +++++++++ .../SupervisionAcceptResultLogic.php | 118 +++++++++ .../SupervisionAcceptProblemValidate.php | 122 ++++++++++ .../SupervisionAcceptResultValidate.php | 126 ++++++++++ .../SupervisionAcceptValidate.php | 226 ++++++++++++++++++ .../supervision_work/SupervisionAccept.php | 59 +++++ .../SupervisionAcceptProblem.php | 34 +++ .../SupervisionAcceptResult.php | 44 ++++ 15 files changed, 1635 insertions(+) create mode 100644 app/adminapi/controller/supervision_work/SupervisionAcceptController.php create mode 100644 app/adminapi/controller/supervision_work/SupervisionAcceptProblemController.php create mode 100644 app/adminapi/controller/supervision_work/SupervisionAcceptResultController.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionAcceptLists.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionAcceptProblemLists.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionAcceptResultLists.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionAcceptProblemLogic.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionAcceptResultLogic.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionAcceptProblemValidate.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionAcceptResultValidate.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php create mode 100644 app/common/model/supervision_work/SupervisionAccept.php create mode 100644 app/common/model/supervision_work/SupervisionAcceptProblem.php create mode 100644 app/common/model/supervision_work/SupervisionAcceptResult.php diff --git a/app/adminapi/controller/supervision_work/SupervisionAcceptController.php b/app/adminapi/controller/supervision_work/SupervisionAcceptController.php new file mode 100644 index 000000000..57724d683 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionAcceptController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionAcceptLists()); + } + + + /** + * @notes 添加工程监理--验收登记 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function add() + { + $params = (new SupervisionAcceptValidate())->post()->goCheck('add'); + $result = SupervisionAcceptLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptLogic::getError()); + } + + + /** + * @notes 编辑工程监理--验收登记 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function edit() + { + $params = (new SupervisionAcceptValidate())->post()->goCheck('edit'); + $result = SupervisionAcceptLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptLogic::getError()); + } + + + /** + * @notes 删除工程监理--验收登记 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function delete() + { + $params = (new SupervisionAcceptValidate())->post()->goCheck('delete'); + SupervisionAcceptLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--验收登记详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function detail() + { + $params = (new SupervisionAcceptValidate())->goCheck('detail'); + $result = SupervisionAcceptLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_work/SupervisionAcceptProblemController.php b/app/adminapi/controller/supervision_work/SupervisionAcceptProblemController.php new file mode 100644 index 000000000..4aa6e5a6d --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionAcceptProblemController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionAcceptProblemLists()); + } + + + /** + * @notes 添加工程监理--验收问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function add() + { + $params = (new SupervisionAcceptProblemValidate())->post()->goCheck('add'); + $result = SupervisionAcceptProblemLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptProblemLogic::getError()); + } + + + /** + * @notes 编辑工程监理--验收问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function edit() + { + $params = (new SupervisionAcceptProblemValidate())->post()->goCheck('edit'); + $result = SupervisionAcceptProblemLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptProblemLogic::getError()); + } + + + /** + * @notes 删除工程监理--验收问题 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function delete() + { + $params = (new SupervisionAcceptProblemValidate())->post()->goCheck('delete'); + SupervisionAcceptProblemLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--验收问题详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function detail() + { + $params = (new SupervisionAcceptProblemValidate())->goCheck('detail'); + $result = SupervisionAcceptProblemLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_work/SupervisionAcceptResultController.php b/app/adminapi/controller/supervision_work/SupervisionAcceptResultController.php new file mode 100644 index 000000000..5c9a27fe9 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionAcceptResultController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionAcceptResultLists()); + } + + + /** + * @notes 添加工程监理--验收结果 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function add() + { + $params = (new SupervisionAcceptResultValidate())->post()->goCheck('add'); + $result = SupervisionAcceptResultLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptResultLogic::getError()); + } + + + /** + * @notes 编辑工程监理--验收结果 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function edit() + { + $params = (new SupervisionAcceptResultValidate())->post()->goCheck('edit'); + $result = SupervisionAcceptResultLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionAcceptResultLogic::getError()); + } + + + /** + * @notes 删除工程监理--验收结果 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function delete() + { + $params = (new SupervisionAcceptResultValidate())->post()->goCheck('delete'); + SupervisionAcceptResultLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--验收结果详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function detail() + { + $params = (new SupervisionAcceptResultValidate())->goCheck('detail'); + $result = SupervisionAcceptResultLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php b/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php new file mode 100644 index 000000000..d7df735b8 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionAcceptLists.php @@ -0,0 +1,94 @@ + ['project_id', 'accept_type'], + '%like%' => ['accept_code'], + ]; + } + + + /** + * @notes 获取工程监理--验收登记列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function lists(): array + { + return SupervisionAccept::withoutField('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(); + $check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty(); + $check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name'); + $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['check_item_name'] = $check_item['node_name']; + $data['company_name'] = $company['unit_name']; + $data['check_item_detail_name'] = implode(',',$check_item_detail); + $data['create_user_name'] = $create_user['name']; + $data['accept_type_text'] = $data->accept_type_text; + $data['accept_result_text'] = $data->accept_result_text; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--验收登记数量 + * @return int + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function count(): int + { + return SupervisionAccept::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionAcceptProblemLists.php b/app/adminapi/lists/supervision_work/SupervisionAcceptProblemLists.php new file mode 100644 index 000000000..333199300 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionAcceptProblemLists.php @@ -0,0 +1,76 @@ + ['accept_id'], + ]; + } + + + /** + * @notes 获取工程监理--验收问题列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function lists(): array + { + return SupervisionAcceptProblem::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取工程监理--验收问题数量 + * @return int + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function count(): int + { + return SupervisionAcceptProblem::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionAcceptResultLists.php b/app/adminapi/lists/supervision_work/SupervisionAcceptResultLists.php new file mode 100644 index 000000000..8e3632442 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionAcceptResultLists.php @@ -0,0 +1,79 @@ + ['accept_id', 'must_check', 'check_result'], + ]; + } + + + /** + * @notes 获取工程监理--验收结果列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function lists(): array + { + return SupervisionAcceptResult::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $data['must_check_text'] = $data->must_check_text; + $data['check_result_text'] = $data->check_result_text; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--验收结果数量 + * @return int + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function count(): int + { + return SupervisionAcceptResult::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php b/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php new file mode 100644 index 000000000..89f0dbcc9 --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionAcceptLogic.php @@ -0,0 +1,222 @@ + $params['project_id'], + 'accept_code' => data_unique_code('YS'), + 'accept_type' => $params['accept_type'], + 'check_item_id' => $params['check_item_id'], + 'accept_content' => $params['accept_content'], + 'accept_position' => $params['accept_position'], + 'accept_time' => !empty($params['accept_time']) ? strtotime($params['accept_time']) : 0, + 'company_id' => $params['company_id'], + 'accept_result' => $params['accept_result'], + 'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null, + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_user' => $admin_id + ]); + if(!empty($params['accept_check_result'])){ + foreach($params['accept_check_result'] as $v){ + SupervisionAcceptResult::create([ + 'accept_id' => $res->id, + 'check_type' => $v['check_type'], + 'check_content' => $v['check_content'], + 'check_problem' => $v['check_problem'], + 'must_check' => $v['must_check'], + 'check_result' => $v['check_result'] + ]); + } + } + if(!empty($params['accept_check_problem'])){ + foreach($params['accept_check_problem'] as $v){ + SupervisionAcceptProblem::create([ + 'accept_id' => $res->id, + 'problem_cate' => $v['problem_cate'], + 'problem_description' => $v['problem_description'], + 'problem_name' => $v['problem_name'], + ]); + } + } + 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/02/27 15:23 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionAccept::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'accept_type' => $params['accept_type'], + 'check_item_id' => $params['check_item_id'], + 'accept_content' => $params['accept_content'], + 'accept_position' => $params['accept_position'], + 'accept_time' => !empty($params['accept_time']) ? strtotime($params['accept_time']) : 0, + 'company_id' => $params['company_id'], + 'accept_result' => $params['accept_result'], + 'check_item_detail_ids' => $params['check_item_detail_ids'] ? json_encode($params['check_item_detail_ids']) : null, + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'update_time' => time(), + ]); + if(!empty($params['accept_check_result'])){ + foreach($params['accept_check_result'] as $v){ + if(!empty($v['id'])){ + SupervisionAcceptResult::where('id',$v['id'])->update([ + 'accept_id' => $params['id'], + 'check_type' => $v['check_type'], + 'check_content' => $v['check_content'], + 'check_problem' => $v['check_problem'], + 'must_check' => $v['must_check'], + 'check_result' => $v['check_result'], + 'update_time' => time(), + ]); + }else{ + SupervisionAcceptResult::create([ + 'accept_id' => $params['id'], + 'check_type' => $v['check_type'], + 'check_content' => $v['check_content'], + 'check_problem' => $v['check_problem'], + 'must_check' => $v['must_check'], + 'check_result' => $v['check_result'] + ]); + } + } + } + if(!empty($params['accept_check_problem'])){ + foreach($params['accept_check_problem'] as $v){ + if(!empty($v['id'])){ + SupervisionAcceptProblem::where('id',$v['id'])->update([ + 'accept_id' => $params['id'], + 'problem_cate' => $v['problem_cate'], + 'problem_description' => $v['problem_description'], + 'problem_name' => $v['problem_name'], + 'update_time' => time(), + ]); + }else{ + SupervisionAcceptProblem::create([ + 'accept_id' => $params['id'], + 'problem_cate' => $v['problem_cate'], + 'problem_description' => $v['problem_description'], + 'problem_name' => $v['problem_name'] + ]); + } + } + } + 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/02/27 15:23 + */ + public static function delete(array $params): bool + { + $accept_result = SupervisionAcceptResult::where('accept_id',$params['id'])->findOrEmpty(); + if(!$accept_result->isEmpty()){ + self::setError('该验收内容下存在验收结果数据，请先删除验收结果数据'); + return false; + } + $accept_problem = SupervisionAcceptProblem::where('accept_id',$params['id'])->findOrEmpty(); + if(!$accept_problem->isEmpty()){ + self::setError('该验收内容下存在验收问题数据，请先删除验收问题数据'); + return false; + } + return SupervisionAccept::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--验收登记详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public static function detail($params): array + { + $data = SupervisionAccept::withoutField('update_time,delete_time')->findOrEmpty($params['id']); + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $check_item = SupervisionCheckItem::field('node_name')->where('id',$data['check_item_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$data['company_id'])->findOrEmpty(); + $check_item_detail = SupervisionCheckItem::where('id','in',$data['check_item_detail_ids'])->column('node_name'); + $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['check_item_name'] = $check_item['node_name']; + $data['company_name'] = $company['unit_name']; + $data['check_item_detail_name'] = implode(',',$check_item_detail); + $data['create_user_name'] = $create_user['name']; + $data['accept_type_text'] = $data->accept_type_text; + $data['accept_result_text'] = $data->accept_result_text; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionAcceptProblemLogic.php b/app/adminapi/logic/supervision_work/SupervisionAcceptProblemLogic.php new file mode 100644 index 000000000..f6da93b72 --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionAcceptProblemLogic.php @@ -0,0 +1,111 @@ + $params['accept_id'], + 'problem_cate' => $params['problem_cate'], + 'problem_description' => $params['problem_description'], + 'problem_name' => $params['problem_name'] + ]); + 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/02/27 15:23 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionAcceptProblem::where('id', $params['id'])->update([ + 'accept_id' => $params['accept_id'], + 'problem_cate' => $params['problem_cate'], + 'problem_description' => $params['problem_description'], + 'problem_name' => $params['problem_name'], + '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/02/27 15:23 + */ + public static function delete(array $params): bool + { + return SupervisionAcceptProblem::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--验收问题详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public static function detail($params): array + { + return SupervisionAcceptProblem::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id'])->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionAcceptResultLogic.php b/app/adminapi/logic/supervision_work/SupervisionAcceptResultLogic.php new file mode 100644 index 000000000..54a54b29c --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionAcceptResultLogic.php @@ -0,0 +1,118 @@ + $params['accept_id'], + 'check_type' => $params['check_type'], + 'check_content' => $params['check_content'], + 'check_problem' => $params['check_problem'], + 'must_check' => $params['must_check'], + 'check_result' => $params['check_result'] + ]); + 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/02/27 15:23 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionAcceptResult::where('id', $params['id'])->update([ + 'accept_id' => $params['accept_id'], + 'check_type' => $params['check_type'], + 'check_content' => $params['check_content'], + 'check_problem' => $params['check_problem'], + 'must_check' => $params['must_check'], + 'check_result' => $params['check_result'], + '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/02/27 15:23 + */ + public static function delete(array $params): bool + { + return SupervisionAcceptResult::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--验收结果详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public static function detail($params): array + { + $data = SupervisionAcceptResult::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $data['must_check_text'] = $data->must_check_text; + $data['check_result_text'] = $data->check_result_text; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionAcceptProblemValidate.php b/app/adminapi/validate/supervision_work/SupervisionAcceptProblemValidate.php new file mode 100644 index 000000000..3628aecc4 --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionAcceptProblemValidate.php @@ -0,0 +1,122 @@ + 'require|checkData', + 'accept_id' => 'require|checkAccept', + 'problem_cate' => 'require', + 'problem_description' => 'require', + 'problem_name' => 'require', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'accept_id' => '验收id', + 'problem_cate' => '问题分类', + 'problem_description' => '问题说明', + 'problem_name' => '问题名称', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionAcceptProblemValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneAdd() + { + return $this->only(['accept_id','problem_cate','problem_description','problem_name']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionAcceptProblemValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneEdit() + { + return $this->only(['id','accept_id','problem_cate','problem_description','problem_name']); + } + + + /** + * @notes 删除场景 + * @return SupervisionAcceptProblemValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionAcceptProblemValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionAcceptProblem::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkAccept($value): bool|string + { + $data = SupervisionAccept::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '验收信息不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionAcceptResultValidate.php b/app/adminapi/validate/supervision_work/SupervisionAcceptResultValidate.php new file mode 100644 index 000000000..2d0b8bd87 --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionAcceptResultValidate.php @@ -0,0 +1,126 @@ + 'require|checkData', + 'accept_id' => 'require|checkAccept', + 'check_type' => 'require', + 'check_content' => 'require', + 'check_problem' => 'require', + 'must_check' => 'require|in:0,1', + 'check_result' => 'require|in:0,1', + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'accept_id' => '验收id', + 'check_type' => '检查类别', + 'check_content' => '检查内容', + 'check_problem' => '检查问题', + 'must_check' => '是否必检', + 'check_result' => '检查结果', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionAcceptResultValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneAdd() + { + return $this->only(['accept_id','check_type','check_content','must_check','check_result']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionAcceptResultValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneEdit() + { + return $this->only(['id','accept_id','check_type','check_content','must_check','check_result']); + } + + + /** + * @notes 删除场景 + * @return SupervisionAcceptResultValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionAcceptResultValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionAcceptResult::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkAccept($value): bool|string + { + $data = SupervisionAccept::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '验收信息不存在'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php b/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php new file mode 100644 index 000000000..264f3202d --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionAcceptValidate.php @@ -0,0 +1,226 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'accept_type' => 'require|checkAcceptType', + 'check_item_id' => 'require|checkCheckItem', + 'accept_time' => 'require|dateFormat:Y-m-d H:i:s', + 'company_id' => 'checkCompany', + 'accept_result' => 'in:0,1', + 'check_item_detail_ids' => 'checkCheckItemDetail', + 'annex' => 'checkAnnex', + 'accept_check_result' => 'checkAcceptResult', + 'accept_check_problem' => 'checkAcceptProblem' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'accept_code' => '验收编号', + 'accept_type' => '验收类型', + 'check_item_id' => '单位工程', + 'accept_content' => '验收内容', + 'accept_position' => '验收位置', + 'accept_time' => '验收时间', + 'company_id' => '施工单位', + 'accept_result' => '验收结果', + 'remark' => '备注', + 'create_user' => '创建人', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionAcceptValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionAcceptValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionAcceptValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionAcceptValidate + * @author likeadmin + * @date 2024/02/27 15:23 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionAccept::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 checkAcceptType($value): bool|string + { + $dict = DictData::where('type_value','accept_type')->column('value'); + if(!in_array($value,$dict)){ + return '验收类型数据值无效'; + } + return true; + } + + public function checkCheckItem($value,$rule,$params): bool|string + { + $data = SupervisionCheckItem::where('id',$value)->where('project_id',$params['project_id'])->where('node_type',2)->findOrEmpty(); + if($data->isEmpty()){ + return '单位工程数据不存在'; + } + return true; + } + + public function checkCompany($value,$rule,$params): bool|string + { + $data = SupervisionParticipatingUnits::where('id',$value)->where('project_id',$params['project_id'])->findOrEmpty(); + if($data->isEmpty()){ + return '施工单位信息不存在'; + } + return true; + } + + public function checkCheckItemDetail($value,$rule,$params): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '检查表单选择数据格式错误'; + foreach($value as $v){ + $data = SupervisionCheckItem::where('id',$v)->where('project_id',$params['project_id'])->findOrEmpty(); + if($data->isEmpty()){ + return '检查项节点数据不存在'; + } + } + return true; + } + + public function checkAnnex($value): bool|string + { + if(!empty($value) && $value != '' && !is_array($value)){ + return '附件格式错误'; + } + return true; + } + + public function checkAcceptResult($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '验收结果数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionAcceptResult::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '验收结果列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['check_type'])) return '验收结果列表第'.($k+1).'行检查类别为空'; + if(empty($v['check_content'])) return '验收结果列表第'.($k+1).'行检查内容为空'; + if(empty($v['check_problem'])) return '验收结果列表第'.($k+1).'行检查问题为空'; + if(!isset($v['must_check']) || $v['must_check'] == '') return '验收结果列表第'.($k+1).'行是否必检为空'; + if(!in_array($v['must_check'],[0,1])) return '验收结果列表第'.($k+1).'行是否必检数据值无效'; + if(!isset($v['check_result']) || $v['check_result'] == '') return '验收结果列表第'.($k+1).'行检查结果为空'; + if(!in_array($v['check_result'],[0,1])) return '验收结果列表第'.($k+1).'行检查结果数据值无效'; + } + return true; + } + + public function checkAcceptProblem($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '验收问题数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionAcceptProblem::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '验收问题列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['problem_cate'])) return '验收问题列表第'.($k+1).'行问题分类为空'; + if(empty($v['problem_description'])) return '验收问题列表第'.($k+1).'行问题说明为空'; + if(empty($v['problem_name'])) return '验收问题列表第'.($k+1).'行问题名称为空'; + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionAccept.php b/app/common/model/supervision_work/SupervisionAccept.php new file mode 100644 index 000000000..a6925de4e --- /dev/null +++ b/app/common/model/supervision_work/SupervisionAccept.php @@ -0,0 +1,59 @@ +column('name','value'); + return !empty($data['accept_type']) ? $dict[$data['accept_type']] : ''; + } + + public function getAcceptResultTextAttr($value,$data){ + $arr = [0=>'合格', 1=>'不合格']; + return $arr[$data['accept_result']]; + } + + public function getAcceptTimeAttr($value): string + { + return !empty($value) ? date('Y-m-d H:i:s', $value) : ''; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionAcceptProblem.php b/app/common/model/supervision_work/SupervisionAcceptProblem.php new file mode 100644 index 000000000..0f22ea410 --- /dev/null +++ b/app/common/model/supervision_work/SupervisionAcceptProblem.php @@ -0,0 +1,34 @@ +'否',1=>'是']; + return $arr[$data['must_check']]; + } + + public function getCheckResultTextAttr($value,$data): string + { + $arr = [0=>'合格',1=>'不合格']; + return $arr[$data['check_result']]; + } +} \ No newline at end of file