Changeset 759

Timestamp:

Feb 11, 2015 12:36:47 PM (10 years ago)

Author:

quyenla

Message:

report

File:

• pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php (modified) (1 diff)

pro-violet-viettel/sourcecode/application/modules/admin/models/reportmodel.php

@@ -166 +166 @@
         //$input['to_year']=2015;
         //$input['to_date']=15;
+        $provinces=array();
         $data=$this->getProvinces($input);
-        return $data;
+        foreach ($data as $index=>$province)
+        {
+            $provinces[]=array("stt"=>$province['stt'],"ngay"=>date("Ymd"),"ma"=>$index,"tinh"=>$province['province'],"thue_bao_ngay"=>$province['tbng'],"thue_bao_thang"=>$province['tbt'],"thue_bao_nam"=>$province['tbn'],"doanh_thu_ngay"=>$province['dtng'],"doanh_thu_thang"=>$province['dtt'],"doanh_thu_nam"=>$province['dtn']);
+        }
+        return $provinces;
     }
     public function exportPackage($input)
     {
         //$input['month']=1;
-        //svn  $input['year']=2014;
+        //$input['year']=2014;
+        $result=array();
         $data=$this->getPackages($input);
-        return $data;
+        $provinces=$data['provinces'];
+        return $provinces;
     }