聚合重新汇总bug修正

master
zhengyongxing 4 years ago
parent 2b4ed15a30
commit e153fb66ca

@ -285,7 +285,9 @@ class AggregateStatementLackController extends ThinkController
//设定组合的子操作 //设定组合的子操作
protected function setDf(&$savedata,$v) protected function setDf(&$savedata,$v)
{ {
$savedata['del_lack_ids'][] = $v['id']; $savedata['del_lack_ids'][] = $v['id'];
$savedata['withdraw_type'] = $v['withdraw_type'];
unset($v['id']); unset($v['id']);
$v['statement_info'] = json_decode( $v['statement_info'],true); $v['statement_info'] = json_decode( $v['statement_info'],true);
$fine = $v['fine']; $fine = $v['fine'];
@ -313,10 +315,11 @@ class AggregateStatementLackController extends ThinkController
"fine"=>$fine, "fine"=>$fine,
"reward"=>$reward, "reward"=>$reward,
"statement_info"=>$v['statement_info'], "statement_info"=>$v['statement_info'],
"statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5) "statement_num"=>"JS_".date('Ymd').date('His').$v['company_id'].sp_random_string(5),
]; ];
$savedata['company_list'][$v['company_id']] = $tdata; $savedata['company_list'][$v['company_id']] = $tdata;
} }
// $savedata['fine'] += $v['fine']; // $savedata['fine'] += $v['fine'];
// $savedata['reward'] += $v['reward']; // $savedata['reward'] += $v['reward'];
// $savedata['pay_amount'] += $v['pay_amount']; // $savedata['pay_amount'] += $v['pay_amount'];

@ -671,6 +671,7 @@ class AggregateStatementPoolController extends ThinkController
"is_payment"=>$pool['is_payment'], "is_payment"=>$pool['is_payment'],
"statement_pool_num"=>$pool['statement_num'], "statement_pool_num"=>$pool['statement_num'],
"statement_info"=>$v['statement_info'], "statement_info"=>$v['statement_info'],
"withdraw_type"=>$pool['withdraw_type'],
]; ];
$l_id = M("aggregate_lack_statement_info","tab_")->add($lackcompany); $l_id = M("aggregate_lack_statement_info","tab_")->add($lackcompany);

Loading…
Cancel
Save