From 1af15969c8cbf69d992944d523556b3fa93e1621 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Mon, 31 Jul 2023 08:49:53 +0900 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=94=A8=E5=AE=9F=E7=B8=BECSV?= =?UTF-8?q?=E3=81=AE=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Web/Custom/HelloTechno/UseSummaryCSVController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php index ef11447..4de53bf 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php @@ -6,6 +6,7 @@ use App\Codes\UserRole; use App\Features\LoginUser; use App\Files\CsvFile; use App\Http\Controllers\Web\IParam; +use App\Models\ReceiptIssuingOrder; use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepository; use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepositoryData as RDATA; use App\Repositories\Custom\HelloTechno\UseSummaryRepository; @@ -53,8 +54,13 @@ class UseSummaryCSVController extends HelloTechnoController ReceiptIssuingOrderRepository::CONDITION_ORDER_DATE_TO => $param->dateTo, UseSummaryRepository::CONDITION_ORDER_DATE_FROM => $param->dateFrom, UseSummaryRepository::CONDITION_ORDER_DATE_TO => $param->dateTo, + ]; - $receiptIssuingOrderList = $this->receiptIssuingOrderRepository->get($condition); + $receiptIssuingOrderList = $this->receiptIssuingOrderRepository->get([ + ...$condition, + UseSummaryRepository::CONDITION_SORT_TARGET => ReceiptIssuingOrder::COL_NAME_ORDER_DATETIME, + UseSummaryRepository::CONDITION_SORT_ORDER => UseSummaryRepository::ORDER_ASC, + ]); $summaryList = $this->useSummaryRepository->get($condition); // CSVファイル作成 @@ -78,7 +84,6 @@ class UseSummaryCSVController extends HelloTechnoController private function getReceiptIssuingOrdersLabel(): array { return [ - RDATA::COL_NAME_ID => 'ID', RDATA::COL_NAME_ORDER_DATETIME => '受付時刻', RDATA::COL_NAME_STATUS_NAME => 'ステータス', RDATA::COL_NAME_PARKING_NAME => '駐車場名',