|
|
@ -498,7 +498,6 @@ class CompanyStatementPoolController extends ThinkController
|
|
|
|
$v['statement_money'] = "=ROUND(";
|
|
|
|
$v['statement_money'] = "=ROUND(";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
|
|
|
|
$handle_data = $this->changeDataStruct($v['statement_info'],$is_export,$week_line);
|
|
|
|
// dump($handle_data);
|
|
|
|
|
|
|
|
$v['statement_info'] = $handle_data;
|
|
|
|
$v['statement_info'] = $handle_data;
|
|
|
|
$row = 0;
|
|
|
|
$row = 0;
|
|
|
|
foreach($v['statement_info'] as $ke=>&$va){
|
|
|
|
foreach($v['statement_info'] as $ke=>&$va){
|
|
|
@ -523,13 +522,9 @@ class CompanyStatementPoolController extends ThinkController
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//本周未结算流水合计
|
|
|
|
//本周未结算流水合计
|
|
|
|
if(!$is_statement){
|
|
|
|
if(!$is_statement){
|
|
|
|
$count['pool_lack_count'] += $val['pay_amount'];
|
|
|
|
|
|
|
|
$count['st_lack_count'] += $val['sum_money'];
|
|
|
|
|
|
|
|
if($is_export){
|
|
|
|
if($is_export){
|
|
|
|
$this->setlackCount($line);
|
|
|
|
$this->setlackCount($line);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}else{
|
|
|
|
|
|
|
|
$count['st_count'] += $val['sum_money'];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -547,6 +542,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){
|
|
|
|
|
|
|
|
$count['pool_lack_count'] += $va['week_amount'];
|
|
|
|
|
|
|
|
$count['st_lack_count'] += $va['week_amount'];
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
$count['st_count'] += $va['week_amount'];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$v['row'] = $row;
|
|
|
|
$v['row'] = $row;
|
|
|
|