From 156fc8646274866a55012364fcad213ce9167014 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 29 Feb 2024 16:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9D=90=E6=96=99=E5=B9=B3?= =?UTF-8?q?=E8=A1=8C=E6=A3=80=E9=AA=8C=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...isionMaterialParallelTestingController.php | 108 ++++++++++ ...aterialParallelTestingDetailController.php | 124 ++++++++++++ ...sionMaterialParallelTestingDetailLists.php | 85 ++++++++ ...upervisionMaterialParallelTestingLists.php | 126 ++++++++++++ .../SupervisionWitnessSamplingLists.php | 16 +- ...sionMaterialParallelTestingDetailLogic.php | 163 +++++++++++++++ ...upervisionMaterialParallelTestingLogic.php | 162 +++++++++++++++ ...nMaterialParallelTestingDetailValidate.php | 186 ++++++++++++++++++ ...rvisionMaterialParallelTestingValidate.php | 171 ++++++++++++++++ .../SupervisionMaterialParallelTesting.php | 41 ++++ ...pervisionMaterialParallelTestingDetail.php | 48 +++++ 11 files changed, 1222 insertions(+), 8 deletions(-) create mode 100644 app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php create mode 100644 app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingDetailController.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingDetailLists.php create mode 100644 app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingDetailLogic.php create mode 100644 app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php create mode 100644 app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php create mode 100644 app/common/model/supervision_work/SupervisionMaterialParallelTesting.php create mode 100644 app/common/model/supervision_work/SupervisionMaterialParallelTestingDetail.php diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php new file mode 100644 index 000000000..325e221d9 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingController.php @@ -0,0 +1,108 @@ +dataLists(new SupervisionMaterialParallelTestingLists()); + } + + + /** + * @notes 添加工程监理--材料平行检验 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function add() + { + $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('add'); + $result = SupervisionMaterialParallelTestingLogic::add($params,$this->adminId); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialParallelTestingLogic::getError()); + } + + + /** + * @notes 编辑工程监理--材料平行检验 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function edit() + { + $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('edit'); + $result = SupervisionMaterialParallelTestingLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialParallelTestingLogic::getError()); + } + + + /** + * @notes 删除工程监理--材料平行检验 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function delete() + { + $params = (new SupervisionMaterialParallelTestingValidate())->post()->goCheck('delete'); + SupervisionMaterialParallelTestingLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--材料平行检验详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function detail() + { + $params = (new SupervisionMaterialParallelTestingValidate())->goCheck('detail'); + $result = SupervisionMaterialParallelTestingLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingDetailController.php b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingDetailController.php new file mode 100644 index 000000000..adaa67376 --- /dev/null +++ b/app/adminapi/controller/supervision_work/SupervisionMaterialParallelTestingDetailController.php @@ -0,0 +1,124 @@ +dataLists(new SupervisionMaterialParallelTestingDetailLists()); + } + + + /** + * @notes 添加工程监理--材料平行检验明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function add() + { + $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('add'); + $result = SupervisionMaterialParallelTestingDetailLogic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError()); + } + + + /** + * @notes 编辑工程监理--材料平行检验明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function edit() + { + $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('edit'); + $result = SupervisionMaterialParallelTestingDetailLogic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError()); + } + + /** + * @notes 检验工程监理--见证取样明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 09:22 + */ + public function check() + { + $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('check'); + $result = SupervisionMaterialParallelTestingDetailLogic::check($params,$this->adminId); + if (true === $result) { + return $this->success('检验成功', [], 1, 1); + } + return $this->fail(SupervisionMaterialParallelTestingDetailLogic::getError()); + } + + + /** + * @notes 删除工程监理--材料平行检验明细 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function delete() + { + $params = (new SupervisionMaterialParallelTestingDetailValidate())->post()->goCheck('delete'); + SupervisionMaterialParallelTestingDetailLogic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取工程监理--材料平行检验明细详情 + * @return \think\response\Json + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function detail() + { + $params = (new SupervisionMaterialParallelTestingDetailValidate())->goCheck('detail'); + $result = SupervisionMaterialParallelTestingDetailLogic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingDetailLists.php b/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingDetailLists.php new file mode 100644 index 000000000..4393f9a3c --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingDetailLists.php @@ -0,0 +1,85 @@ + ['material_parallel_testing_id', 'material_entry_detail_id', 'check_result'], + '%like%' => ['check_code', 'check_user'], + ]; + } + + + /** + * @notes 获取工程监理--材料平行检验明细列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function lists(): array + { + return SupervisionMaterialParallelTestingDetail::withoutField('create_time,update_time,delete_time')->where($this->searchWhere) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $material_entry_detail = SupervisionMaterialEntryDetail::field('name,brand,model,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty(); + $data['name'] = $material_entry_detail['name']; + $data['brand'] = $material_entry_detail['brand']; + $data['model'] = $material_entry_detail['model']; + $data['contract_brand'] = $material_entry_detail->contract_brand_text; + $data['entry_number'] = $material_entry_detail['entry_number']; + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--材料平行检验明细数量 + * @return int + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function count(): int + { + return SupervisionMaterialParallelTestingDetail::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php b/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php new file mode 100644 index 000000000..4b2e716c7 --- /dev/null +++ b/app/adminapi/lists/supervision_work/SupervisionMaterialParallelTestingLists.php @@ -0,0 +1,126 @@ +request->get(); + $where = []; + if(isset($params['code']) && $params['code'] != ''){ + $witness_sampling_ids1 = SupervisionMaterialParallelTesting::where('code','like','%'.$params['code'].'%')->column('id'); + $where[] = ['material_parallel_testing_id','in',$witness_sampling_ids1]; + } + if(isset($params['project_id']) && $params['project_id'] != ''){ + $witness_sampling_ids2 = SupervisionMaterialParallelTesting::where('project_id','=',$params['project_id'])->column('id'); + $where[] = ['material_parallel_testing_id','in',$witness_sampling_ids2]; + } + if(isset($params['name']) && $params['name'] != ''){ + $material_entry_detail_ids = SupervisionMaterialEntryDetail::where('name','like','%'.$params['name'].'%')->column('id'); + $where[] = ['material_entry_detail_id','in',$material_entry_detail_ids]; + } + return SupervisionMaterialParallelTestingDetail::withoutField('check_code,check_time,check_user,check_remark,check_annex,update_time,delete_time')->where($where) + ->limit($this->limitOffset, $this->limitLength) + ->order(['id' => 'desc']) + ->select()->each(function($data){ + $material_parallel_testing = SupervisionMaterialParallelTesting::field('project_id,material_entry_id,code,inspector,inspection_date')->where('id',$data['material_parallel_testing_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id',$material_parallel_testing['project_id'])->findOrEmpty(); + $material_entry = SupervisionMaterialEntry::field('company_id')->where('id',$material_parallel_testing['material_entry_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty(); + $material_entry_detail = SupervisionMaterialEntryDetail::field('name,model,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['company_name'] = $company['unit_name']; + $data['code'] = $material_parallel_testing['code']; + $data['inspector'] = $material_parallel_testing['inspector']; + $data['inspection_date'] = $material_parallel_testing['inspection_date']; + $data['name'] = $material_entry_detail['name']; + $data['model'] = $material_entry_detail['model']; + $data['entry_number'] = $material_entry_detail['entry_number']; + $data['check_result_text'] = $data->check_result_text; + $data['problem_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',7)->count(); + $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',7)->where('is_rectification',1)->count(); + + }) + ->toArray(); + } + + + /** + * @notes 获取工程监理--材料平行检验数量 + * @return int + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function count(): int + { + $params = $this->request->get(); + $where = []; + if(isset($params['code']) && $params['code'] != ''){ + $witness_sampling_ids1 = SupervisionMaterialParallelTesting::where('code','like','%'.$params['code'].'%')->column('id'); + $where[] = ['material_parallel_testing_id','in',$witness_sampling_ids1]; + } + if(isset($params['project_id']) && $params['project_id'] != ''){ + $witness_sampling_ids2 = SupervisionMaterialParallelTesting::where('project_id','=',$params['project_id'])->column('id'); + $where[] = ['material_parallel_testing_id','in',$witness_sampling_ids2]; + } + if(isset($params['name']) && $params['name'] != ''){ + $material_entry_detail_ids = SupervisionMaterialEntryDetail::where('name','like','%'.$params['name'].'%')->column('id'); + $where[] = ['material_entry_detail_id','in',$material_entry_detail_ids]; + } + return SupervisionMaterialParallelTestingDetail::where($where)->count(); + } + +} \ No newline at end of file diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php index 704fda312..2a67fc1e1 100644 --- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php @@ -60,19 +60,19 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List { $params = $this->request->get(); $where = []; - if(!isset($params['code']) && $params['code'] != ''){ + if(isset($params['code']) && $params['code'] != ''){ $witness_sampling_ids1 = SupervisionWitnessSampling::where('code','like','%'.$params['code'].'%')->column('id'); $where[] = ['witness_sampling_id','in',$witness_sampling_ids1]; } - if(!isset($params['project_id']) && $params['project_id'] != ''){ + if(isset($params['project_id']) && $params['project_id'] != ''){ $witness_sampling_ids2 = SupervisionWitnessSampling::where('project_id','=',$params['project_id'])->column('id'); $where[] = ['witness_sampling_id','in',$witness_sampling_ids2]; } - if(!isset($params['name']) && $params['name'] != ''){ + if(isset($params['name']) && $params['name'] != ''){ $material_entry_detail_ids = SupervisionMaterialEntryDetail::where('name','like','%'.$params['name'].'%')->column('id'); $where[] = ['material_entry_detail_id','in',$material_entry_detail_ids]; } - return SupervisionWitnessSamplingDetail::withoutField('check_code,check_time,check_user,check_remark,create_time,update_time,delete_time')->where($where) + return SupervisionWitnessSamplingDetail::withoutField('check_code,check_time,check_user,check_remark,check_annex,create_time,update_time,delete_time')->where($where) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ @@ -108,19 +108,19 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List { $params = $this->request->get(); $where = []; - if(!isset($params['code']) && $params['code'] != ''){ + if(isset($params['code']) && $params['code'] != ''){ $witness_sampling_ids1 = SupervisionWitnessSampling::where('code','like','%'.$params['code'].'%')->column('id'); $where[] = ['witness_sampling_id','in',$witness_sampling_ids1]; } - if(!isset($params['project_id']) && $params['project_id'] != ''){ + if(isset($params['project_id']) && $params['project_id'] != ''){ $witness_sampling_ids2 = SupervisionWitnessSampling::where('project_id','=',$params['project_id'])->column('id'); $where[] = ['witness_sampling_id','in',$witness_sampling_ids2]; } - if(!isset($params['name']) && $params['name'] != ''){ + if(isset($params['name']) && $params['name'] != ''){ $material_entry_detail_ids = SupervisionMaterialEntryDetail::where('name','like','%'.$params['name'].'%')->column('id'); $where[] = ['material_entry_detail_id','in',$material_entry_detail_ids]; } - return SupervisionWitnessSampling::where($where)->count(); + return SupervisionWitnessSamplingDetail::where($where)->count(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingDetailLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingDetailLogic.php new file mode 100644 index 000000000..64a96f35d --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingDetailLogic.php @@ -0,0 +1,163 @@ + $params['material_parallel_testing_id'], + 'material_entry_detail_id' => $params['material_entry_detail_id'], + 'num' => $params['num'], + ]); + 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/29 15:00 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionMaterialParallelTestingDetail::where('id', $params['id'])->update([ + 'material_parallel_testing_id' => $params['material_parallel_testing_id'], + 'material_entry_detail_id' => $params['material_entry_detail_id'], + 'num' => $params['num'], + '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/29 09:22 + */ + public static function check(array $params,$admin_id): bool + { + Db::startTrans(); + try { + SupervisionMaterialParallelTestingDetail::where('id', $params['id'])->update([ + 'check_code' => $params['check_code'], + 'check_result' => $params['check_result'], + 'check_time' => !empty($params['check_time']) ? strtotime($params['check_time']) : 0, + 'check_user' => $params['check_user'], + 'check_remark' => $params['check_remark'], + 'check_annex' => $params['check_annex'] ? json_encode($params['check_annex']) : null, + ]); + if(!empty($params['check_problem'])){ + foreach($params['check_problem'] as $v){ + SupervisionProblem::create([ + 'data_id' => $params['id'], + 'data_type' => 7, + 'problem_cate' => $v['problem_cate'], + 'problem_description' => $v['problem_description'], + 'problem_name' => $v['problem_name'], + 'create_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 2024/02/29 15:00 + */ + public static function delete(array $params): bool + { + $check_problem = SupervisionProblem::where('data_id',$params['id'])->where('data_type',7)->findOrEmpty(); + if(!$check_problem->isEmpty()){ + self::setError('该内容下存在验收问题数据，请先删除验收问题数据'); + return false; + } + return SupervisionMaterialParallelTestingDetail::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--材料平行检验明细详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public static function detail($params): array + { + $data = SupervisionMaterialParallelTestingDetail::withoutField('create_time,update_time,delete_time')->findOrEmpty($params['id']); + $material_entry_detail = SupervisionMaterialEntryDetail::field('name,brand,model,contract_brand,entry_number')->where('id',$data['material_entry_detail_id'])->findOrEmpty(); + $data['name'] = $material_entry_detail['name']; + $data['brand'] = $material_entry_detail['brand']; + $data['model'] = $material_entry_detail['model']; + $data['contract_brand'] = $material_entry_detail->contract_brand_text; + $data['entry_number'] = $material_entry_detail['entry_number']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php new file mode 100644 index 000000000..41eda9d4d --- /dev/null +++ b/app/adminapi/logic/supervision_work/SupervisionMaterialParallelTestingLogic.php @@ -0,0 +1,162 @@ + $params['project_id'], + 'material_entry_id' => $params['material_entry_id'], + 'code' => data_unique_code('CLPXJY'), + 'inspector' => $params['inspector'], + 'inspection_date' => !empty($params['inspection_date']) ? strtotime($params['inspection_date']) : 0, + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'create_user' => $admin_id + ]); + if(!empty($params['detail'])){ + foreach($params['detail'] as $v){ + SupervisionMaterialParallelTestingDetail::create([ + 'material_parallel_testing_id' => $res->id, + 'material_entry_detail_id' => $v['material_entry_detail_id'], + 'num' => $v['num'] + ]); + } + } + 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/29 15:00 + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + SupervisionMaterialParallelTesting::where('id', $params['id'])->update([ + 'project_id' => $params['project_id'], + 'material_entry_id' => $params['material_entry_id'], + 'inspector' => $params['inspector'], + 'inspection_date' => !empty($params['inspection_date']) ? strtotime($params['inspection_date']) : 0, + 'remark' => $params['remark'], + 'annex' => $params['annex'] ? json_encode($params['annex']) : null, + 'update_time' => time() + ]); + if(!empty($params['detail'])){ + foreach($params['detail'] as $v){ + if(!empty($v['id'])){ + SupervisionMaterialParallelTestingDetail::where('id',$v['id'])->update([ + 'material_parallel_testing_id' => $params['id'], + 'material_entry_detail_id' => $v['material_entry_detail_id'], + 'num' => $v['num'], + 'update_time' => time() + ]); + }else{ + SupervisionMaterialParallelTestingDetail::create([ + 'material_parallel_testing_id' => $params['id'], + 'material_entry_detail_id' => $v['material_entry_detail_id'], + 'num' => $v['num'] + ]); + } + } + } + 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/29 15:00 + */ + public static function delete(array $params): bool + { + $detail = SupervisionMaterialParallelTestingDetail::where('material_parallel_testing_id',$params['id'])->findOrEmpty(); + if(!$detail->isEmpty()){ + self::setError('当前数据下存在材料信息内容,请先删除材料信息内容'); + return false; + } + return SupervisionMaterialParallelTesting::destroy($params['id']); + } + + + /** + * @notes 获取工程监理--材料平行检验详情 + * @param $params + * @return array + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public static function detail($params): array + { + $data = SupervisionMaterialParallelTesting::withoutField('update_time,delete_time')->findOrEmpty($params['id']); + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $material_entry = SupervisionMaterialEntry::field('company_id')->where('id',$data['material_entry_id'])->findOrEmpty(); + $company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_id'])->findOrEmpty(); + $create_user = Admin::field('name')->where('id',$data['create_user'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['company_name'] = $company['unit_name']; + $data['create_user_name'] = $create_user['name']; + return $data->toArray(); + } +} \ No newline at end of file diff --git a/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php new file mode 100644 index 000000000..3175d3cdf --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingDetailValidate.php @@ -0,0 +1,186 @@ + 'require|checkData', + 'material_parallel_testing_id' => 'require|checkMaterialParallelTesting', + 'material_entry_detail_id' => 'require|checkMaterialEntryDetail', + 'num' => 'require|float', + 'check_code' => 'require', + 'check_result' => 'require|in:1,2', + 'check_time' => 'require|dateFormat:Y-m-d', + 'check_user' => 'require', + 'check_annex' => 'checkAnnex', + 'check_problem' => 'checkProblem' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'material_parallel_testing_id' => '材料平行检验id', + 'material_entry_detail_id' => '材料进场明细id', + 'num' => '检验数量', + 'check_code' => '报告编号', + 'check_result' => '检验结果', + 'check_time' => '获得日期', + 'check_user' => '操作人', + 'check_remark' => '备注', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionMaterialParallelTestingDetailValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneAdd() + { + return $this->only(['material_parallel_testing_id','material_entry_detail_id','num']); + } + + + /** + * @notes 编辑场景 + * @return SupervisionMaterialParallelTestingDetailValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneEdit() + { + return $this->only(['id','material_parallel_testing_id','material_entry_detail_id','num']); + } + + /** + * @notes 检验场景 + * @return SupervisionMaterialParallelTestingDetailValidate + * @author likeadmin + * @date 2024/02/29 09:22 + */ + public function sceneCheck() + { + return $this->only(['id','check_code','check_result','check_time','check_user','check_remark','check_annex','check_problem']); + } + + + /** + * @notes 删除场景 + * @return SupervisionMaterialParallelTestingDetailValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionMaterialParallelTestingDetailValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionMaterialParallelTestingDetail::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '数据不存在'; + } + return true; + } + + public function checkMaterialParallelTesting($value): bool|string + { + $data = SupervisionMaterialParallelTesting::where('id',$value)->findOrEmpty(); + if($data->isEmpty()){ + return '材料平行检验信息不存在'; + } + return true; + } + + public function checkMaterialEntryDetail($value,$rule,$params): bool|string + { + $witness_sampling = SupervisionMaterialParallelTesting::where('id',$params['material_parallel_testing_id'])->findOrEmpty(); + $data = SupervisionMaterialEntryDetail::where('id',$value)->where('material_entry_id',$witness_sampling['material_entry_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 checkProblem($value): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '检验问题数据格式错误'; + foreach($value as $k=>$v){ + if(!empty($v['id'])){ + $data = SupervisionProblem::where('id',$v['id'])->findOrEmpty(); + if($data->isEmpty()){ + return '检验问题列表第'.($k+1).'行数据不存在'; + } + } + if(empty($v['problem_cate'])){ + return '检验问题列表第'.($k+1).'行问题分类为空'; + }else{ + $dict = DictData::where('type_value','problem_cate')->column('value'); + if(!in_array($v['problem_cate'],$dict)) 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/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php new file mode 100644 index 000000000..3ea3d569d --- /dev/null +++ b/app/adminapi/validate/supervision_work/SupervisionMaterialParallelTestingValidate.php @@ -0,0 +1,171 @@ + 'require|checkData', + 'project_id' => 'require|checkProject', + 'material_entry_id' => 'require|checkMaterialEntry', + 'inspector' => 'require', + 'inspection_date' => 'require|dateFormat:Y-m-d', + 'annex' => 'checkAnnex', + 'detail' => 'checkDetail' + ]; + + + /** + * 参数描述 + * @var string[] + */ + protected $field = [ + 'id' => 'id', + 'project_id' => '项目id', + 'material_entry_id' => '来源单据', + 'code' => '编号', + 'inspector' => '送检人', + 'inspection_date' => '送检日期', + 'remark' => '备注', + 'create_user' => '创建人', + ]; + + + /** + * @notes 添加场景 + * @return SupervisionMaterialParallelTestingValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneAdd() + { + return $this->remove('id',true); + } + + + /** + * @notes 编辑场景 + * @return SupervisionMaterialParallelTestingValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneEdit() + {} + + + /** + * @notes 删除场景 + * @return SupervisionMaterialParallelTestingValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneDelete() + { + return $this->only(['id']); + } + + + /** + * @notes 详情场景 + * @return SupervisionMaterialParallelTestingValidate + * @author likeadmin + * @date 2024/02/29 15:00 + */ + public function sceneDetail() + { + return $this->only(['id']); + } + + public function checkData($value): bool|string + { + $data = SupervisionMaterialParallelTesting::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 checkMaterialEntry($value,$rule,$params): bool|string + { + $data = SupervisionMaterialEntry::where('id',$value)->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 checkDetail($value,$rule,$params): bool|string + { + if(!isset($value) || $value == '') return true; + if(!is_array($value)) return '材料信息数据格式错误'; + foreach($value as $k=>$v) { + if (!empty($v['id'])) { + $data = SupervisionMaterialParallelTestingDetail::where('id', $v['id'])->findOrEmpty(); + if ($data->isEmpty()) { + return '材料信息列表第' . ($k + 1) . '行数据不存在'; + } + } + if (empty($v['material_entry_detail_id'])){ + return '材料信息列表第' . ($k + 1) . '行材料名称为空'; + }else{ + $material = SupervisionMaterialEntryDetail::where('id',$v['material_entry_detail_id'])->where('material_entry_id',$params['material_entry_id'])->findOrEmpty(); + if($material->isEmpty()) return '材料信息列表第' . ($k + 1) . '行材料数据不存在'; + } + if (empty($v['num'])){ + return '材料信息列表第' . ($k + 1) . '行取样数量为空'; + }else{ + if(!is_numeric($v['num'])) return '材料信息列表第' . ($k + 1) . '行取样数量必须是数字'; + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php b/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php new file mode 100644 index 000000000..89b8fbf02 --- /dev/null +++ b/app/common/model/supervision_work/SupervisionMaterialParallelTesting.php @@ -0,0 +1,41 @@ +'未检验', 1=>'符合标准', 2=>'不符合标准']; + return $arr[$data['check_result']]; + } + + public function getCheckTimeAttr($value): string + { + return !empty($value) ? date('Y-m-d') : ''; + } + + public function getCheckAnnexAttr($value) + { + return !empty($value) ? json_decode($value,true) : ''; + } +} \ No newline at end of file