Merge pull request 'feature/more_finance_20201211' (#73) from feature/more_finance_20201211 into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/73

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -792,15 +792,16 @@ class CompanyStatementPoolController extends ThinkController
 
         $line = 1;
         $count = [];
+        // dd($infolist);
         //获取对接人
-        $p_id = array_column($infolist,'company_id');
+        // $p_id = array_column($infolist,'company_id');
-        $map['id'] = ['in',$p_id];
+        // $map['id'] = ['in',$p_id];
-        $pl =  M("promote_company","tab_")->field("id,settlement_contact")->where($map)->select();
+        // $pl =  M("promote_company","tab_")->field("id,settlement_contact")->where($map)->select();
-        $Partner = [];
+        // $Partner = [];
-        foreach($pl as $k=>$v){
+        // foreach($pl as $k=>$v){
-            $Partner[$v['id']] = $v['settlement_contact'];
+        //     $Partner[$v['id']] = $v['settlement_contact'];
-        }
+        // }
-        unset($pl);
+        // unset($pl);
 
         foreach($infolist as $k=>&$v){
 
@@ -855,59 +856,7 @@ class CompanyStatementPoolController extends ThinkController
                 }
             }
 
-
+            $v['settlement_contact'] =  $v['company_info']['link_man'];
-//            $game_list = [];
-//            $statement_info = $v['statement_info'];
-//            //使用时间与会长账号作为键值分离数据
-//            foreach($statement_info as $sk=>$sv){
-//
-//                $sv['time'] = $sv['statement_begin_time'].'-'.$sv['statement_end_time'];
-//                $game_list[$sv['statement_begin_time'].'-'.$sv['statement_end_time']][] = $sv;
-//
-//            }
-//
-//            $handle_data = [];
-//            $substract = 1;
-//
-//            //处理游戏金额数据
-//            foreach($game_list as $gk => $gv) {
-//
-//                foreach ($gv as $lk => $lv){
-//
-//                    if ($lk > 0) {
-//
-//                        for (;;) {
-//
-//                            if (!$handle_data[$lk-$substract]['time']) {
-//                                $substract++;
-//                            } else {
-//                                $handle_data[$lk-$substract]['row'] += 1;
-//                                $handle_data[$lk-$substract]['week_amount'] += $lv['d_statement_money'];
-//                                unset($lv['time']);
-//                                break;
-//                            }
-//
-//                        }
-//
-//                    } else {
-//
-//                        $lv['row'] = 1;
-//                        $lv['week_amount'] = $lv['d_statement_money'];
-//                    }
-//
-//                    array_push($handle_data,$lv);
-//
-//                }
-//
-//            }
-//
-//            $handle_data = $this->changeDataStructVc($v['statement_info'],$is_export,$cline);
-//            $v['statement_info'] = $handle_data;
-//            dump($handle_data);
-
-
-
-            $v['settlement_contact'] = $Partner[$v['company_id']];
 
             if($is_export){