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

application/common/KfjkLogic.php

@@ -34,13 +34,14 @@ class KfjkLogic
             return false;
         }
         $todayall = $this->getTodayServiceData($kfuidarray);
+
         if (!$todayall) {
             return false;
         }
-        $kfuidarray_index = kftoKey($kfuidarray, 1);
 
+        $kfuidarray_index = kftoKey($kfuidarray, 1);
 
-        $uids = $kfuidarray ;
+        $uids = $kfuidarray;
         $hyl = $this->hyl($kfuidarray, $todayall);
         $jdl = $this->jdl($kfuidarray, $todayall);
         $pjhysc = $this->pjhusc($kfuidarray, $todayall);
@@ -54,8 +55,8 @@ class KfjkLogic
             $kfuidarray_index[$uid]['cpl'] = $cpl[$uid];
         }
 
-        $last = [] ;
-        foreach ( $kfuidarray_index as $val){
+        $last = [];
+        foreach ($kfuidarray_index as $val) {
             $last[] = $val;
         }
 
@@ -84,13 +85,14 @@ class KfjkLogic
     {
         $rets = kftoKey($uidArray);
 
-        foreach ($rets as $uid) {
+        foreach ($rets as $uid => $aaaa) {
             foreach ($alllogs as $log) {
-                if ($uid == $log['kf_id']) {
+                if ($uid == $log['kf_id'] && $log['status'] == 2) {
                     $rets[$uid]++;
                 }
             }
         }
+
         return $rets;
     }
 
@@ -99,7 +101,7 @@ class KfjkLogic
     public function jdl($uidArray, $alllogs)
     {
         $rets = kftoKey($uidArray);
-        foreach ($rets as $uid) {
+        foreach ($rets as $uid => $aaa) {
             foreach ($alllogs as $log) {
                 if ($uid == $log['kf_id']) {
                     $rets[$uid]++;
@@ -112,14 +114,16 @@ class KfjkLogic
     //平均会话时长 统计
     public function pjhusc($uidArray, $alllogs)
     {
-
         $rets = kftoKey($uidArray, 1);
 
-        foreach ($rets as $uid) {
+        foreach ($rets as $uid => $aaa) {
             foreach ($alllogs as $log) {
-                if ($uid == $log['kf_id'] && $log['status'] == 2) {
-                    $rets[$uid]['count']++;
-                    $rets[$uid]['times'] += ($log['end_time'] - $log['start_time']);
+                //if ($uid == $log['kf_id'] && $log['status'] == 2) {
+                if ($uid == $log['kf_id']) {
+                    (!isset($rets[$uid]['count'])) ? ($rets[$uid]['count'] = 1) : $rets[$uid]['count']++;
+
+                    (!isset($rets[$uid]['times'])) ? ($rets[$uid]['times'] = 0) : ($log['end_time'] - $log['start_time']);
+
                 }
             }
         }
@@ -127,7 +131,7 @@ class KfjkLogic
         $return = [];
         foreach ($rets as $uid => $val) {
             if (isset($rets[$uid]['count'])) {
-                $return[$uid] = $return[$uid]['times'] / $return[$uid]['count'];
+                $return[$uid] = $rets[$uid]['times'] / $rets[$uid]['count'];
             } else {
                 $return[$uid] = 0;
             }
@@ -140,12 +144,15 @@ class KfjkLogic
     //参评率
     public function cpl($uidArray, $alllogs)
     {
+
         $rets = kftoKey($uidArray, 1);
-        foreach ($rets as $uid) {
+        foreach ($rets as $uid => $aaa) {
             foreach ($alllogs as $log) {
                 if ($uid == $log['kf_id']) {
-                    $rets[$uid]['count']++;
-                    $rets[$uid]['pl'] += ($log['evaluate_id'] > 0 ? 1 : 0);
+
+                    !(isset($rets[$uid]['count'])) ? 1 : $rets[$uid]['count']++;
+                    isset($rets[$uid]['pl']) ? ($rets[$uid]['pl'] = ($log['evaluate_id'] > 0 ? 1 : 0)) : 0;
+
                 }
             }
         }

vendor/GatewayWorker_windows/Applications/whisper/Events.php

@@ -1582,6 +1582,16 @@ class Events
             }
             self::$global->systemconfig = $arr;
         }
+
+        $group = self::$db->query("SELECT *  FROM `ws_groups`");
+        $arr = [];
+        if ($group){
+            foreach ($group as $val){
+                $arr[$val['id']] = $val['name'];
+            }
+            self::$global->groupmap = $arr;
+        }
+
     }
 
     /**