Merge branch 'feature/finance_statement_three' of wmtx/platform into release

优化导出

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -261,12 +261,12 @@ class CompanyStatementPoolController extends ThinkController
 
                     if($is_export){
                         if($withdraw != 3) {
-                            $val['sum_money'] = "=J{$line}*(K{$line}+L{$line})";
+                            $val['sum_money'] = "=K{$line}*(L{$line}+M{$line})";
                         } else {
-                            $val['sum_money'] = "=J{$line}*(L{$line})";
+                            $val['sum_money'] = "=K{$line}*(M{$line})";
                         }
 //                        $val['sum_money'] =  "=J{$line}*(K{$line}+L{$line})";
-                        $v['statement_money'] .= "M{$line}+";
+                        $v['statement_money'] .= "N{$line}+";
                     }else{
                         $count['platform_amount'] += $val['pay_amount'];
                         $count['sum_money'] +=  $val['sum_money'];
@@ -291,8 +291,8 @@ class CompanyStatementPoolController extends ThinkController
         }
 
         if($is_export){
-            $count["platform_amount"] = "=SUM(J2:J".$line.")";
-            $count["sum_money"] = "=SUM(P2:P".$line.")";
+            $count["platform_amount"] = "=SUM(K2:K".$line.")";
+            $count["sum_money"] = "=SUM(Q2:Q".$line.")";
         }
         $this->assign("data",$infolist);
         $this->assign("count",$count);

Application/Admin/View/CompanyStatementPool/viewPuPool.html

@@ -268,7 +268,7 @@
                         </notempty>
                     </foreach>
                     <tr>
-                        <td colspan=9 >合计:</td>
+                        <td colspan=10 >合计:</td>
                         <td>{$count.platform_amount}</td>
                         <td></td>
                         <td></td>