From 066fffc3e2d8107df55dd41d4d50dbe5b69886b1 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Sat, 28 Apr 2018 10:22:40 +0800
Subject: [PATCH] 解决上传原始数据接口ｂｕｇ
---
Yfs/Domain/Data.php | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/Yfs/Domain/Data.php b/Yfs/Domain/Data.php
index 6cfa98c..e1b51c4 100644
--- a/Yfs/Domain/Data.php
+++ b/Yfs/Domain/Data.php
@@ -25,7 +25,7 @@
$arr['address'] = $data['address'];
foreach ($data['data'] as $value) {
- $arr['value'] = $value['value'];
+ $arr['value'] = (float)$value['value'];
$arr['create_time'] = $value['time'];
$arr['date'] = date('Y-m-d', strtotime($value['time']));
if($value['type'] == 0){
@@ -49,7 +49,7 @@
$this->hourly_model->add($arr);
}
$task_arr = array();
- $task_date = $this->hourly_model->get(array('date' => $arr['date']));
+ $task_date = $this->task_model->get(array('date' => $arr['date']));
if(!$task_date){
$task_arr['date'] = $arr['date'];
$this->task_model->add($task_arr);
@@ -69,13 +69,23 @@
* ������������������������
* @return [type] [description]
*/
- public function originalUpload(){
+ 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