Changeset 760

Timestamp:

Feb 11, 2015 1:22:56 PM (10 years ago)

Author:

quyenla

Message:

report

File:

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

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

@@ -166 +166 @@
         //$input['to_year']=2015;
         //$input['to_date']=15;
+        if (isset($input['to_month']))
+        {
+            $date=$input['to_year'].$input['to_month'].$input['to_date'];
+        }
+        else {
+            $date=date("Ymd");
+        }
         $provinces=array();
         $data=$this->getProvinces($input);
         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']);
+            $provinces[]=array("stt"=>$province['stt'],"ngay"=>$date,"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;
@@ -178 +185 @@
         //$input['month']=1;
         //$input['year']=2014;
+        if (isset($input['month']))
+        {
+            $date=$input['year'].$input['month'];
+        }
+        else {
+            $date=date("Ym");
+        }
         $result=array();
         $data=$this->getPackages($input);
-        $provinces=$data['provinces'];
+        $data=$data['provinces'];
+        foreach ($data as $index=>$province)
+        {
+                $package=array();
+                foreach ($province['packages'] as $index2=>$packages)
+                {
+                    $package=  array_merge($package,array("tong_so_".$index2=>$packages['total'],"ti_le_".$index2=>$packages['percent']));
+                }
+                $tong=array("tong_so_tb"=>$province['total']);
+                $province=array("stt"=>$province['stt'],"ngay"=>$date,"ma"=>$index,"tinh"=>$province['province']);
+                $provinces[]= array_merge($province,$package,$tong);
+        }
         return $provinces;
     }