diff --git a/backstage/application/backstage/controllers/Report.php b/backstage/application/backstage/controllers/Report.php index 8613091..c0f38c7 100644 --- a/backstage/application/backstage/controllers/Report.php +++ b/backstage/application/backstage/controllers/Report.php @@ -322,27 +322,16 @@ class Report extends CI_Controller { exit; } - $list = array(); - $order_list = $this->report_model->get_jd_order_list($task_id); - foreach ($order_list as $k => $v){ - $arr = array(); - - if($order_list[0]['add_time'] < '2024-06-01 00:00:00') { - $num = '36'; - }else{ - $num = '41'; - } - - for($i=0;$i<$num;$i++){ - $arr[] = $v["t{$i}"]; - } -// $arr[] = $v['areaname']; - $arr[] = $v['status']; - $list[] = $arr; + // 查询$task_id的详情 + $taskInfo = $this->db->query("select * from tb_jd_task where id='{$task_id}'")->row_array(); + if(empty($taskInfo)){ + $data = array('success' => false, 'msg' => '任务不存在'); + echo json_encode($data); + exit; } - if($order_list[0]['add_time'] < '2024-06-01 00:00:00'){ + if($taskInfo['add_time'] <= '2024-06-01 00:00:00'){ $title = array( '订单编号', '原始订单号', @@ -427,6 +416,20 @@ class Report extends CI_Controller { ); } + $list = array(); + $order_list = $this->report_model->get_jd_order_list($task_id); + foreach ($order_list as $k => $v){ + $arr = array(); + + $num = count($title); + + for($i=0;$i<$num;$i++){ + $arr[] = $v["t{$i}"]; + } +// $arr[] = $v['areaname']; + $arr[] = $v['status']; + $list[] = $arr; + } $sheets = array( array(