From 5bdcf7679c6d82f46a06ee08fe802cba18a68804 Mon Sep 17 00:00:00 2001 From: denghy Date: Tue, 13 Aug 2019 15:22:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Core/AbstractExport.php | 8 ++++++++ app/Domains/Stats/Exports/CompanyReportDetailExport.php | 4 ++++ app/Domains/Stats/Exports/CompanyReportExport.php | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/app/Core/AbstractExport.php b/app/Core/AbstractExport.php index 261cb506..4215a47c 100644 --- a/app/Core/AbstractExport.php +++ b/app/Core/AbstractExport.php @@ -169,6 +169,14 @@ abstract class AbstractExport implements WithEvents, WithTitle, ShouldAutoSize $title = $conditions['company_name'] . ' ' . $title; } + if (($conditions = $this->conditions) && $conditions['package_id']) { + $title = $title . ' P' . $conditions['package_id']; + } + + if (($conditions = $this->conditions) && $conditions['package_name']) { + $title = $conditions['package_name'] . ' ' . $title; + } + return $title ?? '列表'; } diff --git a/app/Domains/Stats/Exports/CompanyReportDetailExport.php b/app/Domains/Stats/Exports/CompanyReportDetailExport.php index ddd03ea6..63aaea55 100644 --- a/app/Domains/Stats/Exports/CompanyReportDetailExport.php +++ b/app/Domains/Stats/Exports/CompanyReportDetailExport.php @@ -125,6 +125,10 @@ class CompanyReportDetailExport extends AbstractExport implements FromQuery, Wit $title = $title . ' C' . $conditions['company_id']; } + if (($conditions = $this->conditions) && $conditions['package_id']) { + $title = $title . ' P' . $conditions['package_id']; + } + return $title ?? '列表'; } diff --git a/app/Domains/Stats/Exports/CompanyReportExport.php b/app/Domains/Stats/Exports/CompanyReportExport.php index 42b82075..39a146e0 100644 --- a/app/Domains/Stats/Exports/CompanyReportExport.php +++ b/app/Domains/Stats/Exports/CompanyReportExport.php @@ -84,6 +84,10 @@ class CompanyReportExport extends AbstractExport implements FromCollection, With $title = $conditions['company_name'] . ' ' . $title; } + if (($conditions = $this->conditions) && $conditions['package_name']) { + $title = $conditions['package_name'] . ' ' . $title; + } + return $title ?? '列表'; }