feat: [계좌내역] 취급점(trans_office) override 수정 기능 추가
This commit is contained in:
@@ -642,10 +642,12 @@ private function parseTransactionLogs($resultData, string $defaultBankName = '',
|
||||
// 원본 적요/내용 (remark2를 합산하지 않음 - 상대계좌예금주명 컬럼에서 별도 표시)
|
||||
$originalSummary = $cleanSummary;
|
||||
$originalCast = $savedItem?->cast ?? $remark2;
|
||||
$originalTransOffice = $log->TransOffice ?? '';
|
||||
|
||||
// 오버라이드 적용 (수정된 값이 있으면 사용)
|
||||
$displaySummary = $override?->modified_summary ?? $originalSummary;
|
||||
$displayCast = $override?->modified_cast ?? $originalCast;
|
||||
$displayTransOffice = $override?->modified_trans_office ?? $originalTransOffice;
|
||||
|
||||
$logItem = [
|
||||
'transDate' => $transDate,
|
||||
@@ -664,7 +666,8 @@ private function parseTransactionLogs($resultData, string $defaultBankName = '',
|
||||
'cast' => $displayCast,
|
||||
'originalCast' => $originalCast,
|
||||
'memo' => $log->Memo ?? '',
|
||||
'transOffice' => $log->TransOffice ?? '',
|
||||
'transOffice' => $displayTransOffice,
|
||||
'originalTransOffice' => $originalTransOffice,
|
||||
// 저장된 계정과목 정보 병합
|
||||
'accountCode' => $savedItem?->account_code ?? '',
|
||||
'accountName' => $savedItem?->account_name ?? '',
|
||||
@@ -1505,13 +1508,15 @@ public function saveOverride(Request $request): JsonResponse
|
||||
'uniqueKey' => 'required|string|max:100',
|
||||
'modifiedSummary' => 'nullable|string|max:200',
|
||||
'modifiedCast' => 'nullable|string|max:200',
|
||||
'modifiedTransOffice' => 'nullable|string|max:200',
|
||||
]);
|
||||
|
||||
$result = BankTransactionOverride::saveOverride(
|
||||
$tenantId,
|
||||
$validated['uniqueKey'],
|
||||
$validated['modifiedSummary'] ?? null,
|
||||
$validated['modifiedCast'] ?? null
|
||||
$validated['modifiedCast'] ?? null,
|
||||
$validated['modifiedTransOffice'] ?? null
|
||||
);
|
||||
|
||||
if ($result === null) {
|
||||
@@ -1529,6 +1534,7 @@ public function saveOverride(Request $request): JsonResponse
|
||||
'id' => $result->id,
|
||||
'modifiedSummary' => $result->modified_summary,
|
||||
'modifiedCast' => $result->modified_cast,
|
||||
'modifiedTransOffice' => $result->modified_trans_office,
|
||||
],
|
||||
]);
|
||||
} catch (\Throwable $e) {
|
||||
|
||||
Reference in New Issue
Block a user