Merge pull request '0521' (#333) from feature/company0521 into release

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

Application/Admin/Controller/PromoteCompanyController.class.php

@@ -110,7 +110,21 @@ class PromoteCompanyController extends ThinkController
 //            $where["_string"] =  "begin_time <= {$time_end}";
 //        }
         // dd($map);
-        
+        if (I('ali_user', 0)) {
+            $map['ali_user'] = I('ali_user');
+        }
+        if (I('ali_account', 0)) {
+            $map['ali_account'] = I('ali_account');
+        }
+        if (I('bank_address', 0)) {
+            $map['bank_address'] = I('bank_address');
+        }
+        if (I('settlement_contact', 0)) {
+            $map['settlement_contact'] = I('settlement_contact');
+        }
+        if (I('contact_phone', 0)) {
+            $map['contact_phone'] = I('contact_phone');
+        }
 
         $page = intval(I('get.p', 0));
         $page = $page ? $page : 1; //默认显示第一页数据

Application/Admin/Controller/SocietyInfoController.class.php

@@ -71,6 +71,9 @@ class SocietyInfoController extends ThinkController
             $map['communication_time'] = array('elt', time() - $gap * 86400);
         }
         if (I('sociaty_level') && I('sociaty_level') != '0') $map['sociaty_level'] = I('sociaty_level');
+        if (I('num')) {
+            $map['id'] = substr(I('num'), 8);
+        }
 
         //获取分页数据
         $query = $model->where($map)->order("communication_time desc");
@@ -122,7 +125,7 @@ class SocietyInfoController extends ThinkController
             return ;
         } else {
             $societyInfos = $order_query->page($page,$row)->field("*")->select();
-//            dump($societyInfos);die();
+//            dump($order_query->_sql());die();
         }
 
         //分页
@@ -136,7 +139,7 @@ class SocietyInfoController extends ThinkController
 
         foreach ($societyInfos as $k => &$v) {
 
-            $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row;
+            $v['num'] = date('Ymd', $v['create_time']).$v['id'];
             $v['sociaty_level_str'] = $this->level[$v['sociaty_level']];
 
             if (time() - $v['communication_time'] > $gap * 86400

Application/Admin/View/PromoteCompany/lists.html

@@ -140,6 +140,21 @@
                     </div>
                 </div>
 
+                <div class="input-list">
+                    <input style="width: 200px;" type="text" name="ali_user" class="search-input" value="{:I('ali_user')}" placeholder="请输入支付宝真实姓名">&nbsp;
+                </div>
+                <div class="input-list">
+                    <input style="width: 200px;" type="text" name="ali_account" class="search-input" value="{:I('ali_account')}" placeholder="请输入支付宝登录账号">&nbsp;
+                </div>
+                <div class="input-list">
+                    <input style="width: 200px;" type="text" name="bank_address" class="search-input" value="{:I('bank_address')}" placeholder="请输入账户名">&nbsp;
+                </div>
+                <div class="input-list">
+                    <input style="width: 200px;" type="text" name="settlement_contact" class="search-input" value="{:I('settlement_contact')}" placeholder="请输入联系结算人">&nbsp;
+                </div>
+                <div class="input-list">
+                    <input style="width: 200px;" type="text" name="contact_phone" class="search-input" value="{:I('contact_phone')}" placeholder="请输入联系电话">&nbsp;
+                </div>
     
                 <div class="input-list">
                     <a class="sch-btn" href="javascript:;" id="search" url="{:U('PromoteCompany/lists','model='.$model['name'].'&row='.I('row'),false)}">搜索</a>

Application/Admin/View/SocietyInfo/lists.html

@@ -88,6 +88,9 @@
             <div class="input-list">
                 <input type="text"  name="text" style="width: 200px" class="" placeholder="快速搜索" value="{:I('text')}"/>&nbsp;
             </div>
+            <div class="input-list">
+                <input type="text"  name="num" style="width: 200px" class="" placeholder="序号" value="{:I('num')}"/>&nbsp;
+            </div>
 
             <input type="hidden" name="sortBy" value="" class="sortBy">