Browse Source

Merge branch 'master' of http://git.dever.cc:3000/dever-package/area

rabin 2 years ago
parent
commit
2fb96b13ce
2 changed files with 50 additions and 7 deletions
  1. 4 1
      database/province.php
  2. 46 6
      lib/Manage.php

+ 4 - 1
database/province.php

@@ -121,7 +121,10 @@ return array
 
 	'manage' => array
 	(
-		
+		'excel' => array
+	    (
+	        array('数据导出', '省份列表', 'area/lib/manage.outProvince'),
+	    ),
 	),
 
 	'request' => array

+ 46 - 6
lib/Manage.php

@@ -180,11 +180,37 @@ class Manage
         }
         return 'ok';
     }
+  
+  public function outProvince($data)
+    {
+        $file = Dever::input('excel_name');
+        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母');
+        
+        $body = array();
+
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if (is_array($v)) {
+                    
+                    $d = array
+                    (
+                      	$v['id'],
+                        $v['name'],
+                      	$v['pinyin'],
+                        $v['pinyin_first'],
+                    );
+                    $body[] = $d;
+                }
+            }
+        }
+
+        return Dever::excelExport($body, $header, $file);
+    }
 
     public function outCity($data)
     {
         $file = Dever::input('excel_name');
-        $header = array('区域名称', '区域价值', '区域状态');
+        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母', '区域价值', '区域状态', '上级区域ID', '上级区域名称');
         
         $body = array();
 
@@ -199,7 +225,6 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $v['name'];
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(1, $v['province_id'] . ',' . $v['id']);
                     } else {
@@ -208,9 +233,14 @@ class Manage
                     
                     $d = array
                     (
+                        $v['id'],
                         $v['name'],
+                      	$v['pinyin'],
+                        $v['pinyin_first'],
                         $price,
                         $status,
+                      	$v['province_id'],
+                        $province['name']
                     );
                     $body[] = $d;
                 }
@@ -223,7 +253,7 @@ class Manage
     public function outCounty($data)
     {
         $file = Dever::input('excel_name');
-        $header = array('区域名称', '区域价值', '区域状态');
+        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母', '区域价值', '区域状态', '上级区域ID', '上级区域名称');
         
         $body = array();
 
@@ -242,7 +272,7 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $city['name'] . '' . $v['name'];
+                    //$v['name'] = $province['name'] . '' . $city['name'] . '' . $v['name'];
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(2, $v['province_id'] . ',' . $v['city_id'] . ',' . $v['id']);
                     } else {
@@ -251,9 +281,14 @@ class Manage
                     
                     $d = array
                     (
+                        $v['id'],
                         $v['name'],
+                      	$v['pinyin'],
+                        $v['pinyin_first'],
                         $price,
                         $status,
+                      	$v['city_id'],
+                        $province['name'] . $city['name']
                     );
                     $body[] = $d;
                 }
@@ -266,7 +301,7 @@ class Manage
     public function outTown($data)
     {
         $file = Dever::input('excel_name');
-        $header = array('区域名称', '区域价值', '区域状态');
+        $header = array('区域ID', '区域名称', '区域拼音', '区域拼音首字母', '区域价值', '区域状态', '上级区域ID', '上级区域名称');
         
         $body = array();
 
@@ -290,7 +325,7 @@ class Manage
                     if ($v['status'] == 2) {
                         $status = '已占用';
                     }
-                    $v['name'] = $province['name'] . '' . $city['name'] . '' . $county['name'] . '' . $v['name'];
+                    //$v['name'] = $province['name'] . '' . $city['name'] . '' . $county['name'] . '' . $v['name'];
                   
                     if ($v['price'] < 0) {
                         $price = Dever::load('area/api')->getPrice(3, $v['province_id'] . ',' . $v['city_id'] . ',' . $v['county_id'] . ',' . $v['id']);
@@ -300,9 +335,14 @@ class Manage
                     
                     $d = array
                     (
+                        $v['id'],
                         $v['name'],
+                      	$v['pinyin'],
+                        $v['pinyin_first'],
                         $price,
                         $status,
+                      	$v['county_id'],
+                        $province['name'] . $city['name'] . $county['name']
                     );
                     $body[] = $d;
                 }