From 0691733b4413614b6eb200eeda3b6f6aca400ac8 Mon Sep 17 00:00:00 2001 From: "sosuke.iwabuchi" Date: Thu, 3 Aug 2023 15:40:24 +0900 Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=94=A8=E5=AE=9F=E7=B8=BECSV?= =?UTF-8?q?=E3=80=80=E9=A1=A7=E5=AE=A2=E3=82=B3=E3=83=BC=E3=83=89=E3=81=AE?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Custom/HelloTechno/UseSummaryCSVController.php | 12 ++++++++++-- .../Custom/HelloTechno/UseSummaryRepository.php | 5 +++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php index 4de53bf..b1a8c97 100644 --- a/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php +++ b/app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php @@ -10,6 +10,7 @@ use App\Models\ReceiptIssuingOrder; use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepository; use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepositoryData as RDATA; use App\Repositories\Custom\HelloTechno\UseSummaryRepository; +use App\Util\DateUtil; use Illuminate\Http\Request; use Symfony\Component\HttpFoundation\BinaryFileResponse; @@ -54,6 +55,7 @@ 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, + UseSummaryRepository::CONDITION_CUSTOMER_CODE => $param->customerCode, ]; $receiptIssuingOrderList = $this->receiptIssuingOrderRepository->get([ @@ -130,7 +132,13 @@ class UseSummaryCSVController extends HelloTechnoController private function getDownloadFileName() { - - return sprintf("利用実績_%s.csv", $this->param->summaryYyyymm); + $param = $this->param; + return sprintf( + "利用実績_%s_%s_%s_%s.csv", + $param->customerCode, + $param->dateFrom->format('Ymd'), + $param->dateTo->format('Ymd'), + DateUtil::now()->format('YmdHis') + ); } } diff --git a/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php b/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php index b64864c..a243200 100644 --- a/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php +++ b/app/Repositories/Custom/HelloTechno/UseSummaryRepository.php @@ -49,6 +49,11 @@ class UseSummaryRepository extends BaseRepository )->where($this->makeColumnName([static::TABLE_NAME, 'rank']), 1); }); + $customerCode = data_get($condition, self::CONDITION_CUSTOMER_CODE); + if ($customerCode) { + $builder->where($this->makeColumnName([static::TABLE_NAME, HtCustomParkingName::COL_NAME_CUSTOMER_CODE]), $customerCode); + } + return $builder; }