Merge remote-tracking branch 'origin/release' into release

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -59,6 +59,8 @@ class PromoteCompanyController extends ThinkController
         $companyids = implode(',', array_column($companyres, 'id'));
         //获取所属会长及其游戏分成
         $promotemap['company_id']=["in",$companyids];
+        $promotemap['level'] = 1;
+        
         $promoteres = M("Promote","tab_")
                     ->field("id,company_id,account,settlement_type")
                     ->where($promotemap)
@@ -177,20 +179,29 @@ class PromoteCompanyController extends ThinkController
             if($v['platform_name'] == '' || $v['platform_name'] == "0"){
                 $v['platform_name'] = "--";
             }
-            $v["is_sign_contact"] = ($v["is_sign_contact"]=="1" ? "是" :'否');
-            
             
+            $v["is_sign_contact"] = ($v["is_sign_contact"]=="1" ? "是" :'否');
+            $v["company_type"] = ($v["company_type"]=="1" ? "公司" :'个人');
+            $v["company_belong"] = ($v["company_belong"]=="0" ? "内团" : ($v["company_belong"]=="1" ? "外团" : ($v["company_belong"]=="2" ? "外团分发" : '无')));
         }
         // dd($companyres);
-        if($is_export){
+        
+     
+        //公司及会长数量统计
+        $companycount = $model->field("id")->where($map)->select();
+        $count = count($companycount);
+        $companyallids = implode(',', array_column($companycount, 'id'));
+        $promotemap['company_id']=["in",$companyallids];
+        $promotecount = M("Promote","tab_")->where($promotemap)->count();
+
         $this->assign('listData', $companyres);
+        $this->assign('count', $count);
+        $this->assign('promotecount', $promotecount);
+        if($is_export){
+            //导出
             $this->display("export");
             die();
         }
-        /* 查询记录总数 */
-        $count = $model
-            ->where($map)
-            ->count();
         //分页
         $parameter['p'] = $page;
         $parameter['row'] = $row;
@@ -198,9 +209,7 @@ class PromoteCompanyController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-
-        $this->assign('listData', $companyres);
-        $this->assign('count', $count);
+        //分配其他页面需要参数
         $this->assign('promoteList', getPromoteByLevel(1));
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/lists'])->find());
         $this->meta_title = '推广公司';

Application/Admin/View/PromoteCompany/export.html

@@ -32,6 +32,8 @@
             <tr>
                 <th>合作方名称</th>
                 <th>对应平台</th>
+                <th>公司性质</th>
+                <th>内外团归属</th>
                 <th>合同期限</th>
                 <th>开票税点</th>
                 <th>开户行</th>
@@ -56,6 +58,8 @@
                     <tr>
                         <td rowspan="{$data.row}">{$data.company_name}</td>
                         <td rowspan="{$data.row}">{$data.platform_name}</td>
+                        <td rowspan="{$data.row}">{$data.company_type}</td>
+                        <td rowspan="{$data.row}">{$data.company_belong}</td>
                         <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
                         <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
                         <td rowspan="{$data.row}">{$data.bank_name}</td>
@@ -66,7 +70,7 @@
                             <foreach name="data['list']" item="promote" key="promotekey">
                                 <if condition="$promotekey gt 0">
                                     <tr>
-                                    <td rowspan="{$promote['row']}"> {$promote['account']}</td>
+                                        <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
                                         <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
                                         <foreach name="promote['list']" item="game" key="gamekey">
                                             <if condition="$gamekey gt 0">
@@ -103,7 +107,7 @@
                                         </foreach>
                                     </tr>
                                 <else />
-                                <td rowspan="{$promote['row']}"> {$promote['account']}</td>
+                                    <td rowspan="{$promote['row']}"> &nbsp;{$promote['account']}</td>
                                     <td rowspan="{$promote['row']}"> {$promote['settlement_type']}</td>
                                     <foreach name="promote['list']" item="game" key="gamekey">
                                         <if condition="$gamekey eq 0">
@@ -143,6 +147,12 @@
                         </notempty>
                     </tr>
                 </volist>
+                <tr class="data_summary">
+                    <td style="text-align: center;">汇总:</td>
+                    <td colspan="15">
+                        累计推广公司数量：{$count}&#12288;&#12288;会长数量:{$promotecount}
+                    </td>
+                </tr>
             </empty>
             </tbody>
     </table>

Application/Admin/View/PromoteCompany/lists.html

@@ -93,6 +93,8 @@
                     <th style="width:10%;min-width:150px;">操作</th>
                     <th>合作方名称</th>
                     <th>对应平台</th>
+                    <th>公司性质</th>
+                    <th>内外团归属</th>
                     <th>合同期限</th>
                     <th>开票税点</th>
                     <th>开户行</th>
@@ -122,6 +124,8 @@
                             </td>
                             <td rowspan="{$data.row}">{$data.company_name}</td>
                             <td rowspan="{$data.row}">{$data.platform_name}</td>
+                            <td rowspan="{$data.row}">{$data.company_type}</td>
+                            <td rowspan="{$data.row}">{$data.company_belong}</td>
                             <td rowspan="{$data.row}">{$data.contact_begin} - {$data.contact_end}</td>
                             <td rowspan="{$data.row}">{$data.fax_ratio}%</td>
                             <td rowspan="{$data.row}">{$data.bank_name}</td>
@@ -209,6 +213,12 @@
                             </notempty>
                         </tr>
                     </volist>
+                    <tr class="data_summary">
+                        <td style="text-align: center;">汇总:</td>
+                        <td colspan="16">
+                            累计推广公司数量：{$count}&#12288;&#12288;会长数量:{$promotecount}
+                        </td>
+                    </tr>
                 </empty>
                 </tbody>
             </table>