浏览代码

利用実績CSVの修正

SATE_RECEIPT-46 利用実績CSVの出力対象が運営会社でフィルターされていない。 CSVファイル名を変更したい。
develop
sosuke.iwabuchi 2 年前
父节点
当前提交
bcb79e2d68
共有 3 个文件被更改,包括 10 次插入4 次删除
  1. +8
    -3
      app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php
  2. +1
    -1
      app/Repositories/Custom/HelloTechno/UseSummaryRepository.php
  3. +1
    -0
      app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php

+ 8
- 3
app/Http/Controllers/Web/Custom/HelloTechno/UseSummaryCSVController.php 查看文件

@@ -12,6 +12,7 @@ use App\Repositories\Custom\HelloTechno\ReceiptIssuingOrderRepositoryData as RDA
use App\Repositories\Custom\HelloTechno\UseSummaryRepository;
use App\Util\DateUtil;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\BinaryFileResponse;

class UseSummaryCSVController extends HelloTechnoController
@@ -78,10 +79,12 @@ class UseSummaryCSVController extends HelloTechnoController
$csv->addLine([]);
$csv->addLine($this->getSummaryHeaderLabels());
$sortDef = array_keys($this->getSummaryHeaderLabels());
$customerName = "xx";
foreach ($summaryList as $row) {
$csv->addLine($row->toArray(), $sortDef);
$customerName = $row->customer_name;
}
return $csv->download($this->getDownloadFileName());
return $csv->download($this->getDownloadFileName($customerName));
}
private function getReceiptIssuingOrdersLabel(): array
{
@@ -130,12 +133,14 @@ class UseSummaryCSVController extends HelloTechnoController
];
}

private function getDownloadFileName()
private function getDownloadFileName(string $customerName)
{

$customerName = Str::of($customerName)->remove(" ")->remove(" ")->toString();
$param = $this->param;
return sprintf(
"利用実績_%s_%s_%s_%s.csv",
$param->customerCode,
$customerName,
$param->dateFrom->format('Ymd'),
$param->dateTo->format('Ymd'),
DateUtil::now()->format('YmdHis')


+ 1
- 1
app/Repositories/Custom/HelloTechno/UseSummaryRepository.php 查看文件

@@ -22,7 +22,7 @@ class UseSummaryRepository extends BaseRepository
* コレクションを取得する
*
* @param array $condition
* @return Collection<UseSummaryRepositoryData>
* @return Collection<int, UseSummaryRepositoryData>
*/
public function get(array $condition): Collection
{


+ 1
- 0
app/Repositories/Custom/HelloTechno/UseSummaryRepositoryData.php 查看文件

@@ -5,6 +5,7 @@ namespace App\Repositories\Custom\HelloTechno;
use App\Repositories\UseSummaryRepositoryData as BaseData;

/**
* @property string $customer_name
*/
class UseSummaryRepositoryData extends BaseData
{


正在加载...
取消
保存