Jonlin 6 gadi atpakaļ
vecāks
revīzija
fa966255a5

+ 2 - 2
application/admin/controller/Report.php

@@ -395,7 +395,7 @@ class Report extends Base
                 $start = strtotime($param['start']);
                 $end = strtotime($param['end'] . ' 23:59:59');
             }
-            $result = db('users')->limit($offset, $limit)->where($where)->select();
+            $result = db('users')->limit($offset, $limit)->where($where)->order('id','asc')->select();
 
             foreach ($result as $key => $vo) {
                 //客服工单数
@@ -441,7 +441,7 @@ class Report extends Base
                 $result[$key]['appraise'] = '';
                 if ($result[$key]['service_num'] != 0) {
                     $result[$key]['appraise'] = $m / $result[$key]['service_num'] * 100;
-                    $result[$key]['appraise'] = round($num, 2) . '%';
+                    $result[$key]['appraise'] = round($result[$key]['appraise'], 2) . '%';
                 }
                 //满意评价
                 $result[$key]['pleased_num'] = db('service_log a')->join('evaluate b', 'a.evaluate_id=b.evaluate_id')->whereBetween('a.start_time', [$start, $end])->where('kf_id', $vo['id'])->where('evaluate_name', '满意')->count();

+ 3 - 1
application/admin/view/report/workreport.html

@@ -170,7 +170,9 @@
 
         $("#toExcel").on("click", function () {
             $("#toExcel").val(1);
-            var url = "{:url('report/workreport')}" + "?pageNumber=1&pageSize=100&toExcel=1";
+            $("#start").val();
+            $("#end").val();
+            var url = "{:url('report/workreport')}" + "?pageNumber=1&pageSize=100&start="+$("#start").val()+"&end="+$("#end").val()+"&toExcel=1";
             window.open(url);
             return false;
         });