From d479d9fbcb37f8b861031c94a83d0e37761210c5 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Tue, 29 May 2018 09:07:03 +0800
Subject: [PATCH] 修改bug
---
application/library/Service/Task.php | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/application/library/Service/Task.php b/application/library/Service/Task.php
index c1a86f0..ee8f5bb 100644
--- a/application/library/Service/Task.php
+++ b/application/library/Service/Task.php
@@ -18,20 +18,21 @@
$time_slot_arr = array();
for($time_slot = 1; $time_slot<=8 ; $time_slot++){
- $hour = ($time_slot - 1)*3;
- $start_hour = $hour.':00:00';
- $end_hour = ($hour + 3).':00:00';
- if($hour < 10 ){
- $start_hour = '0'.$start_hour;
- }
- if($hour + 2 < 10){
- $end_hour = '0'.$end_hour;
- }
- echo '���������'.$day.' ������������'.$start_hour.'---'.$end_hour."======".$user_id."<br />";
+ $min_hour = ($time_slot - 1)*3;
+ $max_hour = $time_slot * 3;
+ // $start_hour = $hour.':00:00';
+ // $end_hour = ($hour + 3).':00:00';
+ // if($hour < 10 ){
+ // $start_hour = '0'.$start_hour;
+ // }
+ // if($hour + 2 < 10){
+ // $end_hour = '0'.$end_hour;
+ // }
+ echo '���������'.$day.' ������������'.$min_hour.'---'.$max_hour."======".$user_id."<br />";
$hourly_data = $hourly_model->aggregate(
array(
array(
- '$match' => array('date' => array('$gte' => $day.' '.$start_hour, '$lt' => $day.' '.$end_hour), 'user_id' => $user_id)
+ '$match' => array('hour' => array('$gte' => $min_hour, '$lt' => $max_hour), 'user_id' => $user_id, 'date' => $day)
),
array(
'$group' => array('_id' => '$user_id', 'avg' => array('$avg' => '$value'))
@@ -41,7 +42,7 @@
)
)
);
-
+ print_r($hourly_data);
if($hourly_data){
$time_slot_arr[$time_slot] = $hourly_data[0]['avg'];
}
--
Gitblit v1.8.0