调整平均值

colly_wyx

2018-05-03 b8a82d561917a4336214225f65f4488d977c5fb1

 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,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;
    }