update
This commit is contained in:
parent
e5071dde0e
commit
d826ad2a31
@ -107,5 +107,10 @@ class SupervisionMaterialEntryController extends BaseAdminController
|
||||
return $this->data($result);
|
||||
}
|
||||
|
||||
public function datas()
|
||||
{
|
||||
return $this->data(SupervisionMaterialEntryLogic::datas());
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -84,7 +84,7 @@ class SupervisionWitnessSamplingLists extends BaseAdminDataLists implements List
|
||||
*/
|
||||
public function count(): int
|
||||
{
|
||||
return SupervisionWitnessSamplingDetail::where($this->searchWhere)->count();
|
||||
return SupervisionWitnessSampling::where($this->searchWhere)->count();
|
||||
}
|
||||
|
||||
}
|
@ -175,4 +175,15 @@ class SupervisionMaterialEntryLogic extends BaseLogic
|
||||
$data['parallel_test_text'] = $data->parallel_test_text;
|
||||
return $data->toArray();
|
||||
}
|
||||
|
||||
public static function datas()
|
||||
{
|
||||
$datas = SupervisionMaterialEntry::field(['id', 'code'])
|
||||
->order(['id' => 'desc'])
|
||||
->select()->each(function($data){
|
||||
$data['projectinfo'] = 'ID:' . $data['id'] . ' / 编码:' . $data['code'];
|
||||
})
|
||||
->toArray();
|
||||
return $datas;
|
||||
}
|
||||
}
|
@ -47,7 +47,7 @@ class SupervisionWitnessSamplingLogic extends BaseLogic
|
||||
$res = SupervisionWitnessSampling::create([
|
||||
'project_id' => $params['project_id'],
|
||||
'material_entry_id' => $params['material_entry_id'],
|
||||
'code' => data_unique_code('CLJZ'),
|
||||
'code' => data_unique_code('JZQY'),
|
||||
'sampling_date' => !empty($params['sampling_date']) ? strtotime($params['sampling_date']) : 0,
|
||||
'witness' => $params['witness'],
|
||||
'sampler' => $params['sampler'],
|
||||
|
Loading…
x
Reference in New Issue
Block a user