分成比例新增生效检索

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -72,7 +72,7 @@ class CompanyGameRatioController extends AdminController
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $time_start = strtotime($_REQUEST['time_start']);
             $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $where["_string"] =  "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end})";
+            $where["_string"] =  "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end}) OR (begin_time <= {$time_end} AND  end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)";
         } elseif (isset($_REQUEST['time_start'])) {
             $time_start = strtotime($_REQUEST['time_start']);
             $where["_string"] =  "end_time >= {$time_start} OR end_time = 0";
@@ -183,7 +183,7 @@ class CompanyGameRatioController extends AdminController
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $time_start = strtotime($_REQUEST['time_start']);
             $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $where["_string"] =  "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end})";
+            $where["_string"] =  "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end})  OR (begin_time <= {$time_end} AND  end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)";
         } elseif (isset($_REQUEST['time_start'])) {
             $time_start = strtotime($_REQUEST['time_start']);
             $where["_string"] =  "end_time >= {$time_start} OR end_time = 0";

Application/Admin/View/CompanyGameRatio/lists.html

@@ -123,6 +123,15 @@
                     </volist>
                 </select>
             </div>
+
+            <div class="input-list">
+                <input type="text" readonly id="time_start" name="time_start" class="" value="{:I('time_start')}" placeholder="生效时间开始" />
+                &nbsp;-&nbsp;
+                <div class="input-append date"  style="display:inline-block">
+                    <input type="text" readonly id="time_end" name="time_end" class="" value="{:I('time_end')}" placeholder="生效时间结束" />
+                    <span class="add-on"><i class="icon-th"></i></span>
+                </div>
+            </div>
             
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('lists','&row='.I('row'),false)}">搜索</a>
@@ -267,6 +276,7 @@
 </volist>
 $(".select_gallery").select2();
 </script>
+<script src="__STATIC__/laydate/laydate.js" type="text/javascript"></script>
 <script type="text/javascript">
 //导航高亮
 highlight_subnav("{:U('index')}");
@@ -385,6 +395,12 @@ $(function(){
             });
         }
     })
+    laydate.render({
+        elem: '#time_start'
+    });
+    laydate.render({
+        elem: '#time_end'
+    });
 
 })