fix:개발 승인 화면 데이터 매핑 수정
- salesPartner.user eager loading 추가로 영업자명 표시 - 대표자명(representative_name) 정보 추가 표시 - pending/progress/completed 목록 모두 동일하게 적용 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -65,7 +65,7 @@ public function getStats(): array
|
||||
public function getPendingApprovals(?string $search = null, int $perPage = 10): LengthAwarePaginator
|
||||
{
|
||||
$query = SalesTenantManagement::query()
|
||||
->with(['tenant', 'salesPartner', 'manager'])
|
||||
->with(['tenant', 'salesPartner.user', 'manager'])
|
||||
->where('sales_progress', 100)
|
||||
->where('manager_progress', 100)
|
||||
->where('hq_status', SalesTenantManagement::HQ_STATUS_PENDING);
|
||||
@@ -96,7 +96,7 @@ public function getInProgressItems(?string $search = null, int $perPage = 10): L
|
||||
];
|
||||
|
||||
$query = SalesTenantManagement::query()
|
||||
->with(['tenant', 'salesPartner', 'manager'])
|
||||
->with(['tenant', 'salesPartner.user', 'manager'])
|
||||
->where('sales_progress', 100)
|
||||
->where('manager_progress', 100)
|
||||
->whereIn('hq_status', $progressStatuses);
|
||||
@@ -118,7 +118,7 @@ public function getInProgressItems(?string $search = null, int $perPage = 10): L
|
||||
public function getCompletedItems(?string $search = null, int $perPage = 10): LengthAwarePaginator
|
||||
{
|
||||
$query = SalesTenantManagement::query()
|
||||
->with(['tenant', 'salesPartner', 'manager'])
|
||||
->with(['tenant', 'salesPartner.user', 'manager'])
|
||||
->where('hq_status', SalesTenantManagement::HQ_STATUS_HANDOVER);
|
||||
|
||||
// 검색
|
||||
@@ -209,7 +209,7 @@ public function getDetail(int $id): SalesTenantManagement
|
||||
{
|
||||
return SalesTenantManagement::with([
|
||||
'tenant',
|
||||
'salesPartner',
|
||||
'salesPartner.user',
|
||||
'manager',
|
||||
'contractProducts.product',
|
||||
])->findOrFail($id);
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
<div class="flex justify-between items-start mb-2">
|
||||
<div>
|
||||
<div class="font-medium text-gray-900 text-sm">{{ $companyName }}</div>
|
||||
<div class="text-xs text-gray-500">{{ $tenant?->business_number ?? '-' }}</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
{{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -18,7 +18,9 @@
|
||||
<div class="flex justify-between items-start mb-2">
|
||||
<div>
|
||||
<div class="font-medium text-gray-900 text-sm">{{ $companyName }}</div>
|
||||
<div class="text-xs text-gray-500">{{ $tenant?->business_number ?? '-' }}</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
{{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-400">{{ $item->updated_at->format('m/d') }}</div>
|
||||
</div>
|
||||
|
||||
@@ -19,7 +19,9 @@
|
||||
<div class="flex justify-between items-start mb-2">
|
||||
<div>
|
||||
<div class="font-medium text-gray-900 text-sm">{{ $companyName }}</div>
|
||||
<div class="text-xs text-gray-500">{{ $tenant?->business_number ?? '-' }}</div>
|
||||
<div class="text-xs text-gray-500">
|
||||
{{ $tenant?->representative_name ?? '-' }} | {{ $tenant?->business_number ?? '-' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-xs text-gray-400">{{ $item->updated_at->format('m/d') }}</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user