Jonlin 6 лет назад
Родитель
Сommit
5d9c2b5ccf

+ 14 - 1
application/admin/controller/System.php

@@ -448,7 +448,20 @@ class System extends Base
 
     public function toexcel()
     {
-        $result = db('service_log')->order('start_time', 'desc')->select();
+        $param = input('param.');
+        $start = $param['start'];
+        $end = $param['end'];
+        $where = [];
+        if(!empty($param['user_id'])){
+            $where['user_id'] = $param['user_id'];
+        }
+        if(!empty($param['group_id'])){
+            $where['group_id'] = $param['group_id'];
+        }
+        if(!empty($param['username'])){
+            $where['user_name'] = $param['username'];
+        }
+        $result = db('service_log')->whereBetween('start_time', [strtotime($start), strtotime($end . ' 23:59:59')])->where($where)->order('start_time', 'desc')->select();
 
         //所有客服
         $users = db('users')->select();

+ 6 - 1
application/admin/view/system/wordslog.html

@@ -194,7 +194,12 @@
 
         $("#toExcel").on("click", function () {
             $("#toExcel").val(1);
-            var url = "{:url('system/toexcel')}" + "?pageNumber=1&pageSize=100&toExcel=1";
+            var start = $("#start").val();
+            var end = $("#end").val();
+            var user_id = $("#user_id").val();
+            var group_id = $("#group_id").val();
+            var username = $("#username").val();
+            var url = "{:url('system/toexcel')}" + "?pageNumber=1&pageSize=100&start="+start+"&end="+end+"&user_id="+user_id+"&group_id="+group_id+"&username="+username+"&toExcel=1";
             window.open(url);
             return false;
         });