Commit d590faa5 authored by zhuwei's avatar zhuwei

1

parent bad100e4
......@@ -566,6 +566,8 @@ class AmercementService
$result[$key]['money_sum'] = $result[$key]['forfeit_penalty'] + $val['money'];//罚款总金额
}
$export = new ExportExcelUntil();
$e_data_new = [];
foreach ($result as $key => $v) {
......@@ -582,7 +584,7 @@ class AmercementService
$e_data_new[] = $e_data_old;
}
$field_num = 10;
$field_num = 9;
$title = ['罚款ID', '罚款项目', '提交时间', '提交人', '罚款金额', '被罚款人', '状态', '滞纳金', '付款金额', '备注'];
$title2 = '罚款账单表';
$export->exportTable('罚款账单表', $e_data_new, $field_num, $title2, $title);
......@@ -637,7 +639,9 @@ class AmercementService
//被罚款人姓名
if (!empty($params['name'])) {
$user_id_str = $this->getAgentIDList($params['name']);
$conditions['agent_id'] = ['in', $user_id_str];
if($user_id_str){
$conditions['agent_id'] = ['in', $user_id_str];
}
}
return $conditions;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment