SamProject/sam-manage
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: Pint 포맷팅 적용

Browse Source
This commit is contained in:
김보곤
2026-02-25 11:45:01 +09:00
parent 68b1622a4e
commit 9a7c548246
199 changed files with 1420 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Finance/DailyFundController.php
View File

@@ -3,13 +3,12 @@
namespace App\Http\Controllers\Finance;
use App\Http\Controllers\Controller;
use App\Models\Finance\DailyFundTransaction;
use App\Models\Finance\DailyFundMemo;
use App\Models\Barobill\BankTransaction as BarobillBankTransaction;
use App\Models\Barobill\BankTransactionOverride;
use App\Models\Finance\DailyFundMemo;
use App\Models\Finance\DailyFundTransaction;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class DailyFundController extends Controller
{
@@ -179,14 +178,14 @@ public function periodReport(Request $request): JsonResponse
->whereBetween('trans_date', [$startDateYmd, $endDateYmd])
->orderBy('id', 'desc') // 최신 ID 우선 (올바른 잔액)
->get()
->unique(fn($tx) => $tx->unique_key)
->unique(fn ($tx) => $tx->unique_key)
->sortByDesc('trans_date')
->sortByDesc(fn($tx) => $tx->trans_date . $tx->trans_time)
->sortByDesc(fn ($tx) => $tx->trans_date.$tx->trans_time)
->values();
// 오버라이드 데이터 병합 (수정된 적요/내용)
if ($transactions->isNotEmpty()) {
$uniqueKeys = $transactions->map(fn($t) => $t->unique_key)->toArray();
$uniqueKeys = $transactions->map(fn ($t) => $t->unique_key)->toArray();
$overrides = BankTransactionOverride::getByUniqueKeys($tenantId, $uniqueKeys);
$transactions = $transactions->map(function ($tx) use ($overrides) {
@@ -199,6 +198,7 @@ public function periodReport(Request $request): JsonResponse
$tx->cast = $override->modified_cast;
}
}
return $tx;
});
}
@@ -211,7 +211,7 @@ public function periodReport(Request $request): JsonResponse
$date = $tx->trans_date;
$accountNum = $tx->bank_account_num;
if (!isset($dailyData[$date])) {
if (! isset($dailyData[$date])) {
$dailyData[$date] = [
'date' => $date,
'dateFormatted' => $this->formatDateKorean($date),
@@ -224,7 +224,7 @@ public function periodReport(Request $request): JsonResponse
}
// 계좌별 데이터 집계
if (!isset($dailyData[$date]['accounts'][$accountNum])) {
if (! isset($dailyData[$date]['accounts'][$accountNum])) {
$dailyData[$date]['accounts'][$accountNum] = [
'bankName' => $tx->bank_name,
'accountNum' => $accountNum,