优化打款剔除后显示

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -223,7 +223,7 @@ class CompanyStatementPoolController extends ThinkController
                 $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();
 
-                $infolist += $lack_info;
+                $infolist =array_merge($infolist,$lack_info);
             }
             $this->viewPuPool($infolist,$is_export);
         }
@@ -259,15 +259,11 @@ class CompanyStatementPoolController extends ThinkController
                     }else{
                         $va['sum_money'] =  "=J{$line}*(K{$line}+L{$line})+M{$line}-N{$line}";
                     }
-                    if($v['st'] == 1){
-                        $count['sum_money_exp'] .= "O{$line}+";
-                        $count['platform_amount_exp'] .= "J{$line}+";
-                    }
+                    $count['sum_money_exp'] .= "O{$line}+";
+                    $count['platform_amount_exp'] .= "J{$line}+";
                 }else{
-                    if($v['st'] == 1){
-                        $count['platform_amount'] += $va['pay_amount'];
-                        $count['sum_money'] +=  $va['sum_money'];
-                    }
+                    $count['platform_amount'] += $va['pay_amount'];
+                    $count['sum_money'] +=  $va['sum_money'];
                 }
             }
             $v['statement_count'] = count($v['statement_info']);

Application/Admin/View/CompanyStatementPool/viewPuPool.html

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