From cbefd79821a454cc65d151be7564cd056c1396bf Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Sat, 2 Mar 2024 14:59:27 +0800 Subject: [PATCH] update --- .../SupervisionWitnessSamplingDetailLists.php | 4 ++ .../SupervisionWitnessSamplingLists.php | 58 ++++--------------- .../SupervisionWitnessSamplingDetailLogic.php | 1 + 3 files changed, 15 insertions(+), 48 deletions(-) diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php index 8c8505905..0029a59ed 100644 --- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php @@ -17,6 +17,7 @@ namespace app\adminapi\lists\supervision_work; use app\adminapi\lists\BaseAdminDataLists; use app\common\model\supervision_work\SupervisionMaterialEntryDetail; +use app\common\model\supervision_work\SupervisionProblem; use app\common\model\supervision_work\SupervisionWitnessSamplingDetail; use app\common\lists\ListsSearchInterface; @@ -66,6 +67,9 @@ class SupervisionWitnessSamplingDetailLists extends BaseAdminDataLists implement $data['model'] = $material_entry_detail['model']; $data['contract_brand'] = $material_entry_detail->contract_brand_text; $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',5)->count(); + $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',5)->where('is_rectification',1)->count(); }) ->toArray(); } diff --git a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php index 2a67fc1e1..41240e48a 100644 --- a/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php +++ b/app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php @@ -19,8 +19,6 @@ use app\adminapi\lists\BaseAdminDataLists; use app\common\model\supervision_project\SupervisionParticipatingUnits; use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_work\SupervisionMaterialEntry; -use app\common\model\supervision_work\SupervisionMaterialEntryDetail; -use app\common\model\supervision_work\SupervisionProblem; use app\common\model\supervision_work\SupervisionWitnessSampling; use app\common\lists\ListsSearchInterface; use app\common\model\supervision_work\SupervisionWitnessSamplingDetail; @@ -43,7 +41,10 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List */ public function setSearch(): array { - return []; + return [ + '=' => ['project_id', 'material_entry_id'], + '%like%' => ['code', 'witness', 'sampler'], + ]; } @@ -58,41 +59,16 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List */ public function lists(): array { - $params = $this->request->get(); - $where = []; - 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'] != ''){ - $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'] != ''){ - $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,check_annex,create_time,update_time,delete_time')->where($where) + return SupervisionWitnessSampling::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()->each(function($data){ - $witness_sampling = SupervisionWitnessSampling::field('project_id,material_entry_id,code,sampling_date,witness')->where('id',$data['witness_sampling_id'])->findOrEmpty(); - $project = SupervisionProject::field('project_name')->where('id',$witness_sampling['project_id'])->findOrEmpty(); - $material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$witness_sampling['material_entry_id'])->findOrEmpty(); + $project = SupervisionProject::field('project_name')->where('id',$data['project_id'])->findOrEmpty(); + $material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$data['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'] = $witness_sampling['code']; + $data['project_name'] = $project['project_name']; + $data['company_name'] = $company['unit_name']; $data['enter_time'] = $material_entry['enter_time']; - $data['sampling_date'] = $witness_sampling['sampling_date']; - $data['witness'] = $witness_sampling['witness']; - $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',5)->count(); - $data['reply_num'] = SupervisionProblem::field('id')->where('data_id',$data['id'])->where('data_type',5)->where('is_rectification',1)->count(); }) ->toArray(); } @@ -106,21 +82,7 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List */ public function count(): int { - $params = $this->request->get(); - $where = []; - 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'] != ''){ - $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'] != ''){ - $material_entry_detail_ids = SupervisionMaterialEntryDetail::where('name','like','%'.$params['name'].'%')->column('id'); - $where[] = ['material_entry_detail_id','in',$material_entry_detail_ids]; - } - return SupervisionWitnessSamplingDetail::where($where)->count(); + return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count(); } } \ No newline at end of file diff --git a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingDetailLogic.php b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingDetailLogic.php index 43e8417d8..c5f2b087e 100644 --- a/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingDetailLogic.php +++ b/app/adminapi/logic/supervision_work/SupervisionWitnessSamplingDetailLogic.php @@ -158,6 +158,7 @@ class SupervisionWitnessSamplingDetailLogic extends BaseLogic $data['model'] = $material_entry_detail['model']; $data['contract_brand'] = $material_entry_detail->contract_brand_text; $data['entry_number'] = $material_entry_detail['entry_number']; + $data['check_result_text'] = $data->check_result_text; return $data->toArray(); } } \ No newline at end of file