Merge pull request '优化统计' (#28) from hotfix/finance_bug_20201222 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/28
master
廖金灵 4 years ago
commit fb130fe767

@ -522,6 +522,7 @@ class CompanyStatementPoolController extends ThinkController
} }
//本周未结算流水合计 //本周未结算流水合计
if(!$is_statement){ if(!$is_statement){
$count['pool_lack_count'] += $val['pay_amount'];
if($is_export){ if($is_export){
$this->setlackCount($line); $this->setlackCount($line);
} }
@ -542,12 +543,12 @@ class CompanyStatementPoolController extends ThinkController
} }
$count['week_money'] += $va['week_amount']; $count['week_money'] += $va['week_amount'];
$count['sum_money'] += $va['week_amount']; $count['sum_money'] += $va['week_amount'];
}
if(!$is_statement){ if(!$is_statement){
$count['pool_lack_count'] += $va['week_amount']; $count['st_lack_count'] += $v['statement_money'];
$count['st_lack_count'] += $va['week_amount'];
}else{ }else{
$count['st_count'] += $va['week_amount']; $count['st_count'] += $v['statement_money'];
}
} }
$v['row'] = $row; $v['row'] = $row;

Loading…
Cancel
Save