From 16261230743913a5f5883c3c8459d8ce3325a42b Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 20 Nov 2019 15:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A17=E6=97=A5?=
 =?UTF-8?q?=E5=B9=B3=E5=9D=87=E6=97=B6=E9=95=BF=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/StatController.class.php  |  2 +-
 .../Admin/Controller/TimingController.class.php        | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/StatController.class.php b/Application/Admin/Controller/StatController.class.php
index f8bba8cbb..46d416787 100644
--- a/Application/Admin/Controller/StatController.class.php
+++ b/Application/Admin/Controller/StatController.class.php
@@ -1390,7 +1390,7 @@ class StatController extends ThinkController
                 $return = $model->where(['time'=>array('between',[$todaystart-86400*30,$todaystart-1])])->sum('active_device');
 //                $return = $device->total_device(['create_time'=>array('between',[$todaystart-86400*30,$todaystart-1])],1);
             } else if ($type == 5) {
-                $return = second_to_duration(($model->where(['time'=>$todaystart])->sum('duration7'))/2);
+                $return = second_to_duration(($model->where(['time'=>$todaystart])->sum('duration7')));
 //                $return = second_to_duration($device->single_duration(['create_time'=>array('between',[$todaystart-86400*7,$todaystart-1])])/7);
             }
 
diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php
index a51234317..4fef0fa9c 100644
--- a/Application/Admin/Controller/TimingController.class.php
+++ b/Application/Admin/Controller/TimingController.class.php
@@ -58,8 +58,9 @@ class TimingController extends AdminController {
 
             $data['model'] = json_encode($this->modelDevice(['create_time'=>['between',[$startTime,$startTime+86399]],'version'=>1]));
 
-            $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1]),'version'=>1]);
-            $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7;
+            $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])]);
+            $newSqls = M('device_record','tab_')->field('min(create_time) as create_time,model,unique_code,id')->group('unique_code')->select(false);
+            $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSqls . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7;
 
             $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>1])->find();
             echo "\n";
@@ -91,8 +92,9 @@ class TimingController extends AdminController {
 
             $data['model'] = json_encode($this->modelDevice(['create_time'=>['between',[$startTime,$startTime+86399]],'version'=>2]));
 
-            $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1]),'version'=>2]);
-            $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7;
+//            $duration = $this->duration(['create_time'=>array('between',[$startTime-86400*7,$startTime-1]),'version'=>2]);
+//            $data['duration7'] = ($duration/M('device_record','tab_')->table('(' . $newSql . ') as a')->where(['create_time'=>array('between',[$startTime-86400*7,$startTime-1])])->order('create_time')->count())/7;
+            $data['duration7'] = 0;
             echo 4;
             $getStatistics = M('device_statistics','tab_')->where(['time'=>$startTime,'version'=>2])->find();
             echo "\n";