Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Report.php

@@ -152,13 +152,13 @@ class Report extends Base
             'allChat' => $allChat,
             'allService' => $allService,
             'allQueue' => $allQueue,
-            'transfer' => floor($transfer/2),
-            'reply' => sprintf("%.2f",(($reply/($allChatLog-$reply))*100)),
-            'waitTime' => ceil($alllWaitTime/$allService),
-            'serviceTime' => ceil($serviceTime/$allService),
-            'cpdTime' => ceil($cpdTime/$allService),
-            'evaluateGood' => sprintf("%.2f",(($evaluateGood/($evaluateGood+$evaluateSecondary+$evaluateBad))*100)),
-            'evaluateGet' => sprintf("%.2f",((($evaluateGood+$evaluateSecondary+$evaluateBad)/($evaluateNo+$evaluateGood+$evaluateSecondary+$evaluateBad))*100)),
+            'transfer' => floor($transfer / 2),
+            'reply' => sprintf("%.2f", (($reply / ($allChatLog - $reply)) * 100)),
+            'waitTime' => ceil($alllWaitTime / $allService),
+            'serviceTime' => ceil($serviceTime / $allService),
+            'cpdTime' => ceil($cpdTime / $allService),
+            'evaluateGood' => sprintf("%.2f", (($evaluateGood / ($evaluateGood + $evaluateSecondary + $evaluateBad)) * 100)),
+            'evaluateGet' => sprintf("%.2f", ((($evaluateGood + $evaluateSecondary + $evaluateBad) / ($evaluateNo + $evaluateGood + $evaluateSecondary + $evaluateBad)) * 100)),
             'evaluate' => json_encode([
                 'evaluateGood' => $evaluateGood,
                 'evaluateSecondary' => $evaluateSecondary,
@@ -217,8 +217,8 @@ class Report extends Base
                 $retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset);
                 return json($retall);
             } else {
-                $title = ['账号', '姓名', '日期', '首次登陆时间', '最后登出时间', '登陆时长', '休息时长', '隐身时长', '在线占比', '休息占比', '', '隐身占比'];
-                $titleKey = ['account', 'uname', 'day', 'of0', 'of1', 'all', '1', '2', '3', 's1p', 's2p', 's3p'];
+                $title = ['账号', '姓名', '日期', '首次登陆时间', '最后登出时间', '在线时长', '登陆时长', '隐身时长', '休息时长', '在线占比', '隐身占比', '休息占比'];
+                $titleKey = ['account', 'uname', 'day', 'of1', 'of0', 'all', 's1', 's2', 's3', 's1p', 's2p', 's3p'];
                 $retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset, true);
                 (new Office())->outdata('考勤数据导出', $retall, $title, $titleKey);
                 return true;
@@ -235,7 +235,7 @@ class Report extends Base
     {
         $allData = [];
         $all_last = [];
-        $stnulldata = ['0' => 0, '1' => 0, '2' => 0, '3' => 0, 'all' => 0, 's1p' => 0, 's2p' => 0, 's3p' => 0];
+        $stnulldata = ['s0' => 0, 's1' => 0, 's2' => 0, 's3' => 0, 'all' => 0, 's1p' => 0, 's2p' => 0, 's3p' => 0];
 
         foreach ($dataArray as $day) {
             foreach ($uobjarr as $uid => $user) {
@@ -261,14 +261,14 @@ class Report extends Base
 
 
         foreach ($all_last as $key => $val) {
-            $all_last[$key]['1'] = secendToHourMinit($all_last[$key]['1']);
-            $all_last[$key]['2'] = secendToHourMinit($all_last[$key]['2']);
-            $all_last[$key]['3'] = secendToHourMinit($all_last[$key]['3']);
+            $all_last[$key]['s1'] = secendToHourMinit($all_last[$key]['s1']);
+            $all_last[$key]['s2'] = secendToHourMinit($all_last[$key]['s2']);
+            $all_last[$key]['s3'] = secendToHourMinit($all_last[$key]['s3']);
             $all_last[$key]['s1p'] = perDisplay($all_last[$key]['s1p']);
             $all_last[$key]['s2p'] = perDisplay($all_last[$key]['s2p']);
             $all_last[$key]['s3p'] = perDisplay($all_last[$key]['s3p']);
             unset($all_last[$key]['uid']);
-            unset($all_last[$key]['0']);
+            unset($all_last[$key]['s0']);
         }
 
 
@@ -383,8 +383,8 @@ class Report extends Base
             $param = input('param.');
             $limit = $param['pageSize'];
             $offset = ($param['pageNumber'] - 1) * $limit;
-            $start = time()-86400;
-            $end = time()-86400;
+            $start = time() - 86400;
+            $end = time() - 86400;
 
             $where = [];
             //用户名称

application/admin/model/Kfstatetimes.php

@@ -29,32 +29,32 @@ class Kfstatetimes extends Model
     {
         $return = [];
         foreach ($array as $val) {
-            $return[$val->sday][$val->kfuid][$val->kstatus] = $val->stime;
+            $return[$val->sday][$val->kfuid]['s'.$val->kstatus] = $val->stime;
         }
 
         foreach ($return as $sday => $sval) {
             foreach ($sval as $kfuid => $tval) {
 
-                if (!isset($tval['0'])) {
-                    $return[$sday][$kfuid]['0'] = 0;
+                if (!isset($tval['s0'])) {
+                    $return[$sday][$kfuid]['s0'] = 0;
                 }
 
-                if (!isset($tval['1'])) {
-                    $return[$sday][$kfuid]['1'] = 0;
+                if (!isset($tval['s1'])) {
+                    $return[$sday][$kfuid]['s1'] = 0;
                 }
-                if (!isset($tval['2'])) {
-                    $return[$sday][$kfuid]['2'] = 0;
+                if (!isset($tval['s2'])) {
+                    $return[$sday][$kfuid]['s2'] = 0;
                 }
-                if (!isset($tval['3'])) {
-                    $return[$sday][$kfuid]['3'] = 0;
+                if (!isset($tval['s3'])) {
+                    $return[$sday][$kfuid]['s3'] = 0;
                 }
 
-                $return[$sday][$kfuid]['all'] = intval($return[$sday][$kfuid]['1']) + intval($return[$sday][$kfuid]['2']) + intval($return[$sday][$kfuid]['3']);
+                $return[$sday][$kfuid]['all'] = intval($return[$sday][$kfuid]['s1']) + intval($return[$sday][$kfuid]['s2']) + intval($return[$sday][$kfuid]['s3']);
 
                 if ($return[$sday][$kfuid]['all'] > 0) {
-                    $return[$sday][$kfuid]['s1p'] = floatPointDigit($return[$sday][$kfuid]['1'] / $return[$sday][$kfuid]['all']);
-                    $return[$sday][$kfuid]['s2p'] = floatPointDigit($return[$sday][$kfuid]['2'] / $return[$sday][$kfuid]['all']);
-                    $return[$sday][$kfuid]['s3p'] = floatPointDigit($return[$sday][$kfuid]['3'] / $return[$sday][$kfuid]['all']);
+                    $return[$sday][$kfuid]['s1p'] = floatPointDigit($return[$sday][$kfuid]['s1'] / $return[$sday][$kfuid]['all']);
+                    $return[$sday][$kfuid]['s2p'] = floatPointDigit($return[$sday][$kfuid]['s2'] / $return[$sday][$kfuid]['all']);
+                    $return[$sday][$kfuid]['s3p'] = floatPointDigit($return[$sday][$kfuid]['s3'] / $return[$sday][$kfuid]['all']);
                 } else {
                     $return[$sday][$kfuid]['s1p'] = 0;
                     $return[$sday][$kfuid]['s2p'] = 0;

application/admin/view/report/attendancereport.html

@@ -65,9 +65,9 @@
                         <th data-field="day">日期</th>
                         <th data-field="of1">首次登陆时间</th>
                         <th data-field="of0">最后登出时间</th>
-                        <th data-field="1">在线时长</th>
-                        <th data-field="3">休息时长</th>
-                        <th data-field="2">隐身时长</th>
+                        <th data-field="s1">在线时长</th>
+                        <th data-field="s3">休息时长</th>
+                        <th data-field="s2">隐身时长</th>
                         <th data-field="all">总登陆时长</th>
                         <th data-field="s1p">在线占比</th>
                         <th data-field="s2p">隐身占比</th>