public function CurWeekRose($stationid, $sdate, $edate) { $reg_sdate = date('Y_m_d', strtotime($sdate)); $reg_edate = date('Y_m_d', strtotime($edate)); $reg_where = " and date BETWEEN '{$reg_sdate}' AND '{$reg_edate}'"; $connect_where = " and date BETWEEN '{$sdate}' AND '{$edate}'"; $obj = new Psys_StationRule(); $data = $obj->TwoWeekRose($stationid, $reg_where, $connect_where); //获取填充数据 $fillarray = $this->fillarray($sdate, $edate); //2015_02_11 //格式化连接数组 $data['regrose'] = $this->arrayformat($data['regrose'], 'rose'); $data['regrose'] += $fillarray; ksort($data['regrose']); $data['downrose'] = $this->arrayformat($data['downrose'], 'rose'); $data['downrose'] += $fillarray; ksort($data['downrose']); return $data; }