diff --git a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php index 4480e460..155b5daa 100644 --- a/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php +++ b/modules/EcommerceFinance/Http/Controllers/ProcessDetails.php @@ -142,16 +142,19 @@ class ProcessDetails extends Controller /** @return array */ private function filters(Request $request): array { - $paidDate = trim((string) $request->query('paid_date', '')); $status = trim((string) $request->query('status', '')); - $paidDateValid = preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $paidDate, $dateParts) === 1 - && checkdate((int) $dateParts[2], (int) $dateParts[3], (int) $dateParts[1]); + [$paidStart, $paidEnd] = ProcessDetailsPageData::normalizePaidDateRange( + $request->query('paid_start'), + $request->query('paid_end'), + $request->query('paid_date'), + ); $paymentState = DingProcessDetailMirrorRepository::normalizePaymentStateFilter( $request->query('payment_state'), ); return [ - 'paid_date' => $paidDateValid ? $paidDate : '', + 'paid_start' => $paidStart, + 'paid_end' => $paidEnd, 'document_type' => mb_substr(trim((string) $request->query('document_type', '')), 0, 100), 'status' => mb_substr($status, 0, 20), 'payment_state' => $paymentState, diff --git a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php index d250df5f..e9ca5be5 100644 --- a/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php +++ b/modules/EcommerceFinance/Repositories/DingProcessDetailMirrorRepository.php @@ -279,9 +279,24 @@ class DingProcessDetailMirrorRepository { $query->where('ding_process_detail_mirror.source_scope', $this->scope()); - $paidDate = trim((string) ($filters['paid_date'] ?? '')); - if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $paidDate) === 1) { - $query->where('ding_process_detail_mirror.paid_at', 'like', $paidDate . '%'); + $paidStart = $this->filterDate($filters['paid_start'] ?? ''); + $paidEnd = $this->filterDate($filters['paid_end'] ?? ''); + if ($paidStart === '' && $paidEnd === '') { + $paidStart = $this->filterDate($filters['paid_date'] ?? ''); + $paidEnd = $paidStart; + } + if ($paidStart !== '' && $paidEnd !== '' && $paidStart > $paidEnd) { + [$paidStart, $paidEnd] = [$paidEnd, $paidStart]; + } + if ($paidStart !== '') { + $query->where('ding_process_detail_mirror.paid_at', '>=', $paidStart); + } + if ($paidEnd !== '') { + $query->where( + 'ding_process_detail_mirror.paid_at', + '<', + Carbon::createFromFormat('Y-m-d', $paidEnd)->addDay()->toDateString(), + ); } foreach ([ @@ -341,6 +356,17 @@ class DingProcessDetailMirrorRepository END"; } + private function filterDate(mixed $value): string + { + $date = trim((string) $value); + if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $date, $parts) !== 1 + || ! checkdate((int) $parts[2], (int) $parts[3], (int) $parts[1])) { + return ''; + } + + return $date; + } + /** * @param array $filters * @return list diff --git a/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php b/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php index b6e1eab9..ca51be64 100644 --- a/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php +++ b/modules/EcommerceFinance/Services/DingProcessDetailMirrorSynchronizer.php @@ -25,15 +25,6 @@ class DingProcessDetailMirrorSynchronizer private const APPROVAL_API_FALLBACK_LIMIT = 50; - private const STATUS_MAP = [ - 'COMPLETED' => '已完成', - 'RUNNING' => '审批中', - 'TERMINATED' => '已终止', - 'CANCELED' => '已撤销', - 'CANCELLED' => '已撤销', - 'REVOKED' => '已撤销', - ]; - private readonly ConnectionInterface $connection; private int $approvalApiAttempts = 0; @@ -869,7 +860,7 @@ class DingProcessDetailMirrorSynchronizer $originator = $employees[(string) ($workflow['originatorUserId'] ?? '')] ?? $this->originatorFromTitle($title); $documentType = $this->documentType($process, $title); - $status = $this->status((string) ($workflow['status'] ?? '')); + $status = $this->status($workflow); $businessMonth = $this->businessMonth($businessId, (string) ($workflow['joinAt'] ?? '')); $paymentSourceState = $this->paymentSourceState($process, $fields); $needsPaymentApi = $this->needsApprovalApiFallback( @@ -1661,11 +1652,21 @@ class DingProcessDetailMirrorSynchronizer return trim((string) ($process['document_type'] ?? '')) ?: '其他'; } - private function status(string $status): string + /** @param array $workflow */ + private function status(array $workflow): string { - $status = strtoupper(trim($status)); + $key = DingPayableWorkflowStatus::key($workflow); - return self::STATUS_MAP[$status] ?? ($status !== '' ? $status : '未知'); + return match ($key) { + 'RUNNING' => '审批中', + 'COMPLETED' => '已完成', + 'REJECTED' => '已拒绝', + 'WITHDRAWN' => '已终止', + 'FAILED' => '失败', + 'EXPIRED' => '已过期', + 'DELETED' => '已删除', + default => $key !== '' && $key !== 'UNKNOWN' ? $key : '未知', + }; } private function businessMonth(string $businessId, string $joinAt): string diff --git a/modules/EcommerceFinance/View/ProcessDetailsPageData.php b/modules/EcommerceFinance/View/ProcessDetailsPageData.php index 39ce1b20..5269b24b 100644 --- a/modules/EcommerceFinance/View/ProcessDetailsPageData.php +++ b/modules/EcommerceFinance/View/ProcessDetailsPageData.php @@ -26,6 +26,26 @@ class ProcessDetailsPageData : self::DEFAULT_PER_PAGE; } + /** @return array{0:string,1:string} */ + public static function normalizePaidDateRange( + mixed $start, + mixed $end, + mixed $legacyDate = '', + ): array { + $start = self::normalizeFilterDate($start); + $end = self::normalizeFilterDate($end); + if ($start === '' && $end === '') { + $legacyDate = self::normalizeFilterDate($legacyDate); + $start = $legacyDate; + $end = $legacyDate; + } + if ($start !== '' && $end !== '' && $start > $end) { + [$start, $end] = [$end, $start]; + } + + return [$start, $end]; + } + /** @return array */ public function page(Request $request): array { @@ -97,16 +117,19 @@ class ProcessDetailsPageData /** @return array */ private function filters(Request $request): array { - $paidDate = trim((string) $request->query('paid_date', '')); $status = trim((string) $request->query('status', '')); - $paidDateValid = preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $paidDate, $dateParts) === 1 - && checkdate((int) $dateParts[2], (int) $dateParts[3], (int) $dateParts[1]); + [$paidStart, $paidEnd] = self::normalizePaidDateRange( + $request->query('paid_start'), + $request->query('paid_end'), + $request->query('paid_date'), + ); $paymentState = DingProcessDetailMirrorRepository::normalizePaymentStateFilter( $request->query('payment_state'), ); return [ - 'paid_date' => $paidDateValid ? $paidDate : '', + 'paid_start' => $paidStart, + 'paid_end' => $paidEnd, 'document_type' => mb_substr(trim((string) $request->query('document_type', '')), 0, 100), 'status' => mb_substr($status, 0, 20), 'payment_state' => $paymentState, @@ -115,4 +138,15 @@ class ProcessDetailsPageData 'keyword' => mb_substr(trim((string) $request->query('keyword', '')), 0, 100), ]; } + + private static function normalizeFilterDate(mixed $value): string + { + $date = trim((string) $value); + if (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $date, $parts) !== 1 + || ! checkdate((int) $parts[2], (int) $parts[3], (int) $parts[1])) { + return ''; + } + + return $date; + } } diff --git a/resources/views/business/pages/financial-operations/process-details-content.blade.php b/resources/views/business/pages/financial-operations/process-details-content.blade.php index b139bc24..9ecfd819 100644 --- a/resources/views/business/pages/financial-operations/process-details-content.blade.php +++ b/resources/views/business/pages/financial-operations/process-details-content.blade.php @@ -20,7 +20,7 @@ $statusClass ??= static fn (string $status): string => match ($status) { '已完成' => 'is-success', '审批中' => 'is-warning', - '已终止', '已撤销' => 'is-danger', + '已拒绝', '已终止', '已撤销', '失败' => 'is-danger', default => 'is-neutral', }; $paymentStateClass = static fn (string $state): string => match ($state) { @@ -41,6 +41,8 @@ . ($exportFilters === [] ? '' : '?' . http_build_query($exportFilters)); @endphp + @include('business.pages.partials.date-range-picker') +