update
This commit is contained in:
parent
5e8d611ded
commit
93c75dca14
@ -58,7 +58,7 @@
|
|||||||
*/
|
*/
|
||||||
public function lists(): array
|
public function lists(): array
|
||||||
{
|
{
|
||||||
return MarketingContract::withoutField('update_time,delete_time')->where($this->searchWhere)->where('contract_type', 1)
|
return MarketingContract::withoutField('update_time,delete_time')->where($this->searchWhere)->where('contract_type', 2)
|
||||||
->limit($this->limitOffset, $this->limitLength)
|
->limit($this->limitOffset, $this->limitLength)
|
||||||
->order(['id' => 'desc'])
|
->order(['id' => 'desc'])
|
||||||
->select()->each(function ($data) {
|
->select()->each(function ($data) {
|
||||||
@ -68,10 +68,10 @@
|
|||||||
$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
|
$admin = Admin::where('id', 'in', [$data['part_b_signatory'], $data['signed_head'], $data['seal_user']])->column('name', 'id');
|
||||||
$data['supplementary_agreement_name'] = $contract['contract_name'];
|
$data['supplementary_agreement_name'] = $contract['contract_name'];
|
||||||
$data['part_a_name'] = $custom['name'];
|
$data['part_a_name'] = $custom['name'];
|
||||||
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']];
|
$data['part_b_signatory_name'] = $admin[$data['part_b_signatory']] ?? '';
|
||||||
$data['signed_dept_name'] = $dept['name'];
|
$data['signed_dept_name'] = $dept['name'];
|
||||||
$data['signed_head_name'] = $admin[$data['signed_head']];
|
$data['signed_head_name'] = $admin[$data['signed_head']] ?? '';
|
||||||
$data['seal_user_name'] = $admin[$data['seal_user']];
|
$data['seal_user_name'] = $admin[$data['seal_user']] ?? '';
|
||||||
$data['business_nature_text'] = $data->business_nature_text;
|
$data['business_nature_text'] = $data->business_nature_text;
|
||||||
$data['agreement_nature_text'] = $data->agreement_nature_text;
|
$data['agreement_nature_text'] = $data->agreement_nature_text;
|
||||||
$data['seal_name_text'] = $data->seal_name_text;
|
$data['seal_name_text'] = $data->seal_name_text;
|
||||||
@ -106,7 +106,7 @@
|
|||||||
*/
|
*/
|
||||||
public function count(): int
|
public function count(): int
|
||||||
{
|
{
|
||||||
return MarketingContract::where($this->searchWhere)->where('contract_type', 1)->count();
|
return MarketingContract::where($this->searchWhere)->where('contract_type', 2)->count();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user