diff --git a/app/Http/Controllers/Finance/DailyFundController.php b/app/Http/Controllers/Finance/DailyFundController.php index 07ba4e97..a4b1890f 100644 --- a/app/Http/Controllers/Finance/DailyFundController.php +++ b/app/Http/Controllers/Finance/DailyFundController.php @@ -6,6 +6,7 @@ use App\Models\Finance\DailyFundTransaction; use App\Models\Finance\DailyFundMemo; use App\Models\Barobill\BankTransaction as BarobillBankTransaction; +use App\Models\Barobill\BankTransactionOverride; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -180,6 +181,25 @@ public function periodReport(Request $request): JsonResponse ->orderBy('trans_time', 'desc') ->get(); + // 오버라이드 데이터 병합 (수정된 적요/내용) + if ($transactions->isNotEmpty()) { + $uniqueKeys = $transactions->map(fn($t) => $t->unique_key)->toArray(); + $overrides = BankTransactionOverride::getByUniqueKeys($tenantId, $uniqueKeys); + + $transactions = $transactions->map(function ($tx) use ($overrides) { + $override = $overrides->get($tx->unique_key); + if ($override) { + if ($override->modified_summary) { + $tx->summary = $override->modified_summary; + } + if ($override->modified_cast) { + $tx->cast = $override->modified_cast; + } + } + return $tx; + }); + } + // 일별로 그룹핑 $dailyData = []; $accountBalances = []; // 계좌별 최신 잔액 추적 diff --git a/resources/views/finance/daily-fund.blade.php b/resources/views/finance/daily-fund.blade.php index bb8fbc86..bf1b8d96 100644 --- a/resources/views/finance/daily-fund.blade.php +++ b/resources/views/finance/daily-fund.blade.php @@ -224,7 +224,7 @@ className="px-3 py-2 border border-gray-300 rounded-lg text-sm" {report.deposits.map((d, dIdx) => (