From b8a82d561917a4336214225f65f4488d977c5fb1 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 03 May 2018 09:28:00 +0800
Subject: [PATCH] 调整平均值
---
Yfs/Domain/Data.php | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index 8237215..a9be7c0 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -49,9 +49,10 @@
$this->hourly_model->add($arr);
}
$task_arr = array();
- $task_date = $this->task_model->get(array('date' => $arr['date']));
+ $task_date = $this->task_model->get(array('date' => $arr['date'], 'user_id' => $arr['user_id']));
if(!$task_date){
$task_arr['date'] = $arr['date'];
+ $task_arr['user_id'] = $arr['user_id'];
$this->task_model->add($task_arr);
}
@@ -69,13 +70,23 @@
* ������������������������
* @return [type] [description]
*/
- public function originalUpload($data){
+ public function originalUpload($param){
$arr = array();
- $arr['data'] = $data['data'];
- $arr['time'] = $data['time'];
+ if(!empty($param->data)){
+ $data = $param->data;
+ }
+ else{
+ $data = $param->data_1;
+ }
+
+ $arr['data'] = $data;
+ $arr['time'] = $param->time;
+ $arr['user_id'] = $param->user_id;
$arr['create_time'] = date('Y-m-d H:i:s');
- $this->data_original_model->add($arr);
- return true;
+ if($this->data_original_model->add($arr))
+ return true;
+ else
+ return false;
}
--
Gitblit v1.8.0