init

www/protected/controllers/ROrderController.php

@@ -1067,28 +1067,36 @@ class ROrderController extends AdminController{
         $export =Yii::app()->request->getParam('export','execute_order');
         $export_type = Yii::app()->request->getParam('export_type','');
         if($export == 'execute_order'){
+
             $endYesterday=mktime(0,0,0,date('m'),date('d'),date('Y'))-1;
             if($export_type == 'day'){
+                $name=date('Y-m-d').'日订单执行汇总';    //生成的Excel文件文件名
                 $beginYesterday=mktime(0,0,0,date('m'),date('d')-1,date('Y'));
             } else if($export_type == 'week') {
+                $name=date('Y-m-d').'周订单执行汇总';    //生成的Excel文件文件名
                 $beginYesterday=mktime(0,0,0,date('m'),date('d')-6,date('Y'));
             } else if($export_type == 'month') {
+                $name=date('Y-m-d').'月订单执行汇总';    //生成的Excel文件文件名
                 $beginYesterday=mktime(0,0,0,date('m')-1,1,date('Y'));
                 $endYesterday=mktime(0,0,0,date('m'),1,date('Y'))-1;
             }
         } else {
             $beginYesterday=mktime(0,0,0,date('m')-1,1,date('Y'));
             $endYesterday=mktime(0,0,0,date('m'),1,date('Y'))-1;
+            if($export =='tech') {
+                $name=date('Y-m-d').'月保洁师营收';    //生成的Excel文件文件名
+            } else {
+                $name=date('Y-m-d').'月订单明细汇总';    //生成的Excel文件文件名
+            }
         }
 
         $criteria = new EMongoCriteria();
         $criteria->booking_time('>=',$beginYesterday);//开始时间
         $criteria->booking_time('<=',$endYesterday);//结束时间
-        $criteria->status('=',6);
+        $criteria->status('==',6);
         $data = ROrder::model()->findAll($criteria);
         $rows = CommonFn::getRowsFromCursor($data);
         $data = ROrder::model()->parse($rows);
-        $name=date('Y-m-d').'导出';    //生成的Excel文件文件名
         $res=Service::factory('ExcelToArrayService')->push($data,$name,$export);
         echo "导出成功";
     }

www/protected/services/ExcelToArrayService.php

@@ -121,7 +121,7 @@ class ExcelToArrayService extends Service
                     //Excel的第A列，uid是你查出数组的键值，下面以此类推
                     ->setCellValue('A' . $num, $server_date)
                     ->setCellValue('B' . $num, $server_time)
-                    ->setCellValue('C' . $num, $value['address']['detail'])
+                    ->setCellValue('C' . $num, $value['address']['poi']['name'].$value['address']['detail'])
                     ->setCellValue('D' . $num, $value['products_str'])
                     ->setCellValue('E' . $num, $technicians)
                     ->setCellValue('F' . $num, $value['memo'].$value['remark'])
@@ -151,7 +151,8 @@ class ExcelToArrayService extends Service
                 $technicians = '';
                 $server_date = date('Y-m-d',$value['booking_time']);
                 $server_time = date('H:i:s',$value['booking_time']);
-                $order_id =Yii::app()->params['o2o_service'][$value['products'][0]['product']['type']].'-'.time();
+
+                $order_id =$value['products'][0]['product']['type'].'-'.$value['order_time'];
                 foreach($value['technicians'] as $k => $v){
                     $technicians .= $v['technician_name'].'  ';
                 }
@@ -166,7 +167,7 @@ class ExcelToArrayService extends Service
                     ->setCellValue('E' . $num, $value['address']['name'])
                     ->setCellValue('F' . $num, $value['address']['mobile'])
                     ->setCellValue('G' . $num, $value['address']['area'])
-                    ->setCellValue('H' . $num, $value['address']['detail'])
+                    ->setCellValue('H' . $num, $value['address']['poi']['name'].$value['address']['detail'])
                     ->setCellValue('I' . $num, $technicians)
                     ->setCellValue('J' . $num, $value['memo'].$value['remark'])
 

www/protected/views/rOrder/index.php

@@ -14,6 +14,23 @@
     <div region="west" border="false" id="west_panel">
         <table id="dg_content"></table>
         <div id="tb_content">
+            <div class="tb_line">
+                <span class="tb_label">
+                    <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order('execute_order','day');return false;">导出日订单</a>
+                </span>
+                <span class="tb_label">
+                    <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order('execute_order','week');return false;">导出周订单</a>
+                </span>
+                <span class="tb_label">
+                    <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order('execute_order','week');return false;">导出月订单</a>
+                </span>
+                <span class="tb_label">
+                    <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order('tech','');return false;">导出月保洁师营收</a>
+                </span>
+                <span class="tb_label">
+                    <a href="#" class='easyui-linkbutton' iconCls="icon-add" plain="true" onclick="export_order('order','');return false;">导出月订单明细</a>
+                </span>
+            </div>
             <div class="tb_line">
                 <input id="ss" />
                 <span class="tb_label">服务</span>
@@ -1618,5 +1635,8 @@
             $('#resetTecName').val('');
         }
     }
+    function export_order(exp,export_type) {
+        window.location.href = module_router+'/OutputExcel&export='+exp+'&export_type='+export_type;
+    }
 
 </script>