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

# Conflicts:
#	vendor/GatewayWorker_windows/Applications/whisper/Events.php

application/admin/controller/Report.php

@@ -152,13 +152,13 @@ class Report extends Base
             'allChat' => $allChat,
             'allService' => $allService,
             'allQueue' => $allQueue,
-            'transfer' => floor($transfer/2),
-            'reply' => ($allChatLog?sprintf("%.2f",(($reply/($allChatLog-$reply))*100)) : '--'),
-            'waitTime' => ($allService?ceil($alllWaitTime/$allService) : '--'),
-            'serviceTime' => ($allService?ceil($serviceTime/$allService) : '--'),
-            'cpdTime' => ($allService?ceil($cpdTime/$allService) : '--'),
-            'evaluateGood' => (($evaluateGood+$evaluateSecondary+$evaluateBad)?sprintf("%.2f",(($evaluateGood/($evaluateGood+$evaluateSecondary+$evaluateBad))*100)) : '--'),
-            'evaluateGet' => (($evaluateNo+$evaluateGood+$evaluateSecondary+$evaluateBad)?sprintf("%.2f",((($evaluateGood+$evaluateSecondary+$evaluateBad)/($evaluateNo+$evaluateGood+$evaluateSecondary+$evaluateBad))*100)) : '--'),
+            'transfer' => floor($transfer / 2),
+            'reply' => ($allChatLog ? sprintf("%.2f", (($reply / ($allChatLog - $reply)) * 100)) : '--'),
+            'waitTime' => ($allService ? ceil($alllWaitTime / $allService) : '--'),
+            'serviceTime' => ($allService ? ceil($serviceTime / $allService) : '--'),
+            'cpdTime' => ($allService ? ceil($cpdTime / $allService) : '--'),
+            'evaluateGood' => (($evaluateGood + $evaluateSecondary + $evaluateBad) ? sprintf("%.2f", (($evaluateGood / ($evaluateGood + $evaluateSecondary + $evaluateBad)) * 100)) : '--'),
+            'evaluateGet' => (($evaluateNo + $evaluateGood + $evaluateSecondary + $evaluateBad) ? sprintf("%.2f", ((($evaluateGood + $evaluateSecondary + $evaluateBad) / ($evaluateNo + $evaluateGood + $evaluateSecondary + $evaluateBad)) * 100)) : '--'),
             'evaluate' => json_encode([
                 'evaluateGood' => $evaluateGood,
                 'evaluateSecondary' => $evaluateSecondary,
@@ -256,10 +256,9 @@ class Report extends Base
         }
 
         usort($all_last, function ($a, $b) {
-            return $a['uid'] == $b['uid'] ? 0 : ($a['uid'] > $b['uid'] ? 1 : -1);
+            return $a['uid'] == $b['uid'] ? (($a['day'] > $b['day']) ? 1 : -1) : ($a['uid'] > $b['uid'] ? 1 : -1);
         });
 
-
         foreach ($all_last as $key => $val) {
             $all_last[$key]['s1'] = secendToHourMinit($all_last[$key]['s1']);
             $all_last[$key]['s2'] = secendToHourMinit($all_last[$key]['s2']);
@@ -294,7 +293,7 @@ class Report extends Base
         return $return;
     }
 
-
+  
     /**
      * 时间分割
      *