|
|
|
@ -155,8 +155,11 @@ class PartnerController extends ThinkController
|
|
|
|
|
$value['settlement_type'] = '月结';
|
|
|
|
|
}
|
|
|
|
|
$value['company_type'] = $value['company_type'] == 2 ? '个人' : '公司';
|
|
|
|
|
$value['contract_time'] = time_format($value['contract_start_time'], 'Y/m/d') . '-' .
|
|
|
|
|
time_format($value['contract_end_time'], 'Y/m/d');
|
|
|
|
|
$contract_start_time = $value['contract_start_time'] ?
|
|
|
|
|
time_format($value['contract_start_time'], 'Y/m/d') : '-';
|
|
|
|
|
$contract_end_time = $value['contract_end_time'] ?
|
|
|
|
|
time_format($value['contract_end_time'], 'Y/m/d') : '-';
|
|
|
|
|
$value['contract_time'] = $contract_start_time . '-' . $contract_end_time;
|
|
|
|
|
$row2 = array_sum(array_column($value['game'], 'row')) ;
|
|
|
|
|
$value['row'] = empty($row2) ? 1: $row2;
|
|
|
|
|
$parseData[$value['partner_id']][] = $value;
|
|
|
|
|