diff --git a/frontend/controllers/FinanceController.php b/frontend/controllers/FinanceController.php index d2bd428..f46fb33 100644 --- a/frontend/controllers/FinanceController.php +++ b/frontend/controllers/FinanceController.php @@ -213,8 +213,8 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'] = []; foreach($items as $item) { $row = $item->toArray(); - $row['group'] = $item->user->group->name; - $row['company_name'] = $item->order->company2->name; + $row['group'] = $item->user->group ? $item->user->group->name : ''; + $row['company_name'] = $item->order->company2 ? $item->order->company2->name : 0; $row['username'] = $item->user->getShowName(); $row['submit_date'] = $item->order->submit_date; $row['print_date'] = $item->order->print_date; @@ -222,6 +222,13 @@ class FinanceController extends \frontend\controllers\UserBaseController $data['rows'][] = $row; } + $data['rows'][] = array( + ['商业保总额', $sum_total], + ['商业净保总额', $sum_total_clear], + ['回款总额', $sum_r_total], + ['回款差额', $sum_total_dis] + ); + return $data; } public function actionReceiptImport() { diff --git a/frontend/views/finance/receipt.php b/frontend/views/finance/receipt.php index 5e5e604..aa2a1d8 100644 --- a/frontend/views/finance/receipt.php +++ b/frontend/views/finance/receipt.php @@ -23,8 +23,8 @@ use \common\libs\MyLib;