elf
/
cf-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/change_statement_time' of wmtx/platform into release

Browse Source
master
陈志 4 years ago committed by Gogs
parent 697dad95c8 b63369cdba
commit 575c074c39
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File

19
Application/Admin/Controller/CompanyStatementPoolController.class.php
Unescape Escape View File

@ -19,7 +19,8 @@ class CompanyStatementPoolController extends ThinkController
public $WithdrawType = [ public $WithdrawType = [
"0"=>"周结", "0"=>"周结",
"1"=>"月结", "1"=>"月结",
"2"=>"下游个人补点" "2"=>"下游个人补点",
"3"=>"其他",
]; ];
public $VerifyStatus=[ public $VerifyStatus=[
"-2"=>"拒绝打款", "-2"=>"拒绝打款",
@ -174,7 +175,7 @@ class CompanyStatementPoolController extends ThinkController
$v['oplist'] = $this->OpAuth($v); $v['oplist'] = $this->OpAuth($v);
} }
$count = $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find(); $count = $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money,SUM(lack_statement_money) lack_statement_money")->where($map)->find();
// dd($count); // dd($count);
$params['p'] = $page; $params['p'] = $page;
$params['row'] = $row; $params['row'] = $row;
@ -223,7 +224,7 @@ class CompanyStatementPoolController extends ThinkController
$l_ids = $pool_info['create_lack_ids']; $l_ids = $pool_info['create_lack_ids'];
$lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select(); $lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select();
$infolist += $lack_info; $infolist =array_merge($infolist,$lack_info);
} }
$this->viewPuPool($infolist,$is_export); $this->viewPuPool($infolist,$is_export);
} }
@ -259,15 +260,11 @@ class CompanyStatementPoolController extends ThinkController
}else{ }else{
$va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}"; $va['sum_money'] = "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
} }
if($v['st'] == 1){ $count['sum_money_exp'] .= "O{$line}+";
$count['sum_money_exp'] .= "O{$line}+"; $count['platform_amount_exp'] .= "J{$line}+";
$count['platform_amount_exp'] .= "J{$line}+";
}
}else{ }else{
if($v['st'] == 1){ $count['platform_amount'] += $va['pay_amount'];
$count['platform_amount'] += $va['pay_amount']; $count['sum_money'] += $va['sum_money'];
$count['sum_money'] += $va['sum_money'];
}
} }
} }
$v['statement_count'] = count($v['statement_info']); $v['statement_count'] = count($v['statement_info']);

6
Application/Admin/View/CompanyStatementPool/lists.html
Unescape Escape View File

@ -157,7 +157,7 @@
<th>结算周期</th> <th>结算周期</th>
<th>是否打款</th> <th>是否打款</th>
<th>结算金额</th> <th>结算金额</th>
<th>结算流水</th> <!-- <th>结算流水</th> -->
<th>不结算金额</th> <th>不结算金额</th>
<th>创建记录</th> <th>创建记录</th>
<th>审批状态</th> <th>审批状态</th>
@ -184,7 +184,7 @@
<td>{$data.withdraw_type}</td> <td>{$data.withdraw_type}</td>
<td>{$data.is_payment_str}</td> <td>{$data.is_payment_str}</td>
<td>{$data.statement_money}</td> <td>{$data.statement_money}</td>
<td>{$data.platform_amount}</td> <!-- <td>{$data.platform_amount}</td> -->
<td>{$data.lack_statement_money}</td> <td>{$data.lack_statement_money}</td>
<td>{$data.create}</td> <td>{$data.create}</td>
<td> <td>
@ -217,7 +217,7 @@
</td> </td>
</tr> </tr>
</volist> </volist>
<tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">结算总金额:&nbsp;{$count.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td></tr> <tr><td style="line-height: 42px;">合计</td><td colspan="13" style="line-height: 42px;">结算总金额:&nbsp;{$count.statement_money}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;不结算总金额:{$count.lack_statement_money}&nbsp;&nbsp;&nbsp;</td></tr>
</notemtpy> </notemtpy>
</tbody> </tbody>
</table> </table>

2
Application/Admin/View/CompanyStatementPool/viewPuPool.html
Unescape Escape View File

@ -193,7 +193,7 @@
</foreach> </foreach>
</foreach> </foreach>
<tr> <tr>
<td colspan=9 >合计(仅统计结算公司):</td> <td colspan=9 >合计:</td>
<td>{$count.platform_amount|default=0}</td> <td>{$count.platform_amount|default=0}</td>
<td></td> <td></td>
<td></td> <td></td>

Write Preview
Loading…
Cancel
Save