mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-02 14:59:27 +08:00
parent 449c6bed6e
commit cbefd79821
3 changed files with 15 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/adminapi/lists/supervision_work/SupervisionWitnessSamplingDetailLists.php
View File

@ -17,6 +17,7 @@ namespace app\adminapi\lists\supervision_work;
use app\adminapi\lists\BaseAdminDataLists; use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_work\SupervisionMaterialEntryDetail; use app\common\model\supervision_work\SupervisionMaterialEntryDetail;
use app\common\model\supervision_work\SupervisionProblem;
use app\common\model\supervision_work\SupervisionWitnessSamplingDetail; use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
@ -66,6 +67,9 @@ class SupervisionWitnessSamplingDetailLists extends BaseAdminDataLists implement
$data['model'] = $material_entry_detail['model']; $data['model'] = $material_entry_detail['model'];
$data['contract_brand'] = $material_entry_detail->contract_brand_text; $data['contract_brand'] = $material_entry_detail->contract_brand_text;
$data['entry_number'] = $material_entry_detail['entry_number']; $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(); ->toArray();
} }

58
app/adminapi/lists/supervision_work/SupervisionWitnessSamplingLists.php
View File

@ -19,8 +19,6 @@ use app\adminapi\lists\BaseAdminDataLists;
use app\common\model\supervision_project\SupervisionParticipatingUnits; use app\common\model\supervision_project\SupervisionParticipatingUnits;
use app\common\model\supervision_project\SupervisionProject; use app\common\model\supervision_project\SupervisionProject;
use app\common\model\supervision_work\SupervisionMaterialEntry; 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\model\supervision_work\SupervisionWitnessSampling;
use app\common\lists\ListsSearchInterface; use app\common\lists\ListsSearchInterface;
use app\common\model\supervision_work\SupervisionWitnessSamplingDetail; use app\common\model\supervision_work\SupervisionWitnessSamplingDetail;
@ -43,7 +41,10 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
*/ */
public function setSearch(): array 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 public function lists(): array
{ {
$params = $this->request->get(); return SupervisionWitnessSampling::withoutField('create_user,create_time,update_time,delete_time')->where($this->searchWhere)
$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)
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->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',$data['project_id'])->findOrEmpty();
$project = SupervisionProject::field('project_name')->where('id',$witness_sampling['project_id'])->findOrEmpty(); $material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$data['material_entry_id'])->findOrEmpty();
$material_entry = SupervisionMaterialEntry::field('company_id,enter_time')->where('id',$witness_sampling['material_entry_id'])->findOrEmpty();
$company = SupervisionParticipatingUnits::field('unit_name')->where('id',$material_entry['company_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['project_name'] = $project['project_name']; $data['company_name'] = $company['unit_name'];
$data['company_name'] = $company['unit_name'];
$data['code'] = $witness_sampling['code'];
$data['enter_time'] = $material_entry['enter_time']; $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(); ->toArray();
} }
@ -106,21 +82,7 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
*/ */
public function count(): int public function count(): int
{ {
$params = $this->request->get(); return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count();
$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();
} }
} }

1
app/adminapi/logic/supervision_work/SupervisionWitnessSamplingDetailLogic.php
View File

@ -158,6 +158,7 @@ class SupervisionWitnessSamplingDetailLogic extends BaseLogic
$data['model'] = $material_entry_detail['model']; $data['model'] = $material_entry_detail['model'];
$data['contract_brand'] = $material_entry_detail->contract_brand_text; $data['contract_brand'] = $material_entry_detail->contract_brand_text;
$data['entry_number'] = $material_entry_detail['entry_number']; $data['entry_number'] = $material_entry_detail['entry_number'];
$data['check_result_text'] = $data->check_result_text;
return $data->toArray(); return $data->toArray();
} }
} }