Updated public

www/protected/controllers/JRecordController.php

@@ -151,7 +151,7 @@ class JRecordController extends AdminController
             $data = $parsedRows;
             $type_name = '全部';
         }
-        $res=Service::factory('JRecordService')->push($data,$type_name);
+        $res=Service::factory('JRecordService')->push($data,$type_name,['start' => $start_time, 'end' => $end_time]);
     }
 
 

www/protected/services/JRecordService.php

@@ -14,7 +14,7 @@ class JRecordService extends Service
      * @param string $name 导出的excel名称
      * @param $export 导出的类型  execute_export 执行订单汇总 order订单明细 tech保洁师明细
      */
-    public function push($data,$type) {
+    public function push($data,$type,$date) {
         error_reporting(E_ALL);
         date_default_timezone_set('Asia/Shanghai');
         $channel_option = ROrder::$channel_option;
@@ -29,6 +29,14 @@ class JRecordService extends Service
             ->setCategory("result file");
         /*以下就是对处理Excel里的数据， 横着取数据，主要是这一步，其他基本都不要改*/
         $num = 1;
+        $objPHPExcel->setActiveSheetIndex(0)
+            //Excel的第A列，uid是你查出数组的键值，下面以此类推
+            ->setCellValue('A' . $num, '开始时间')//$name
+            ->setCellValue('B' . $num, $date['start'])//$work_time_part
+            ->setCellValue('C' . $num, '结束时间')//$work_time_part
+            ->setCellValue('D' . $num, $date['end'])//$work_time_part
+        ;
+        $num++;
         $objPHPExcel->setActiveSheetIndex(0)
             //Excel的第A列，uid是你查出数组的键值，下面以此类推
             ->setCellValue('A' . $num, '礼包名称')//$name
@@ -37,9 +45,12 @@ class JRecordService extends Service
             ->setCellValue('D' . $num, '收货人')//$address
             ->setCellValue('E' . $num, '收货人联系方式')//$address
             ->setCellValue('F' . $num, '收货地址')//$address
-            ->setCellValue('G' . $num, '供货商信息')//$work_time_part
-            ->setCellValue('H' . $num, '联系人')//$work_time_part
-            ->setCellValue('I' . $num, '联系方式');//$work_time_part
+            ->setCellValue('G' . $num, '供应商信息')//$work_time_part
+            ->setCellValue('H' . $num, '物流商')//$work_time_part
+            ->setCellValue('I' . $num, '运单号')//$work_time_part
+            ->setCellValue('J' . $num, '发货时间')//$work_time_part
+            ->setCellValue('K' . $num, '备注')//$work_time_part
+        ;
         $num += 1;
         foreach($data as $key => $value){
             $objPHPExcel->setActiveSheetIndex(0)
@@ -51,8 +62,6 @@ class JRecordService extends Service
                 ->setCellValue('E' . $num, $value['mobile'])
                 ->setCellValue('F' . $num, $value['address'])
                 ->setCellValue('G' . $num, $value['supplier_source'])
-                ->setCellValue('H' . $num, $value['supplier_name'])
-                ->setCellValue('I' . $num, $value['supplier_mobile'])
             ;
             $num += 1;
         }