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; }