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

feat:차량일지 구분 유형 확장 및 라벨 수정

Browse Source 
- 구분 유형 추가: 출퇴근용(왕복), 업무용(왕복), 비업무용(왕복)
- 비업무 라벨을 '비업무용(개인)'으로 변경
- 출발지/도착지 장소명 라벨 수정 (장소명 → 출발지명/도착지명)
- 새 유형별 색상 추가

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
김보곤
2026-02-03 13:27:56 +09:00
parent 4e5f8ba77c
commit 35d0260732
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Finance/VehicleLogController.php
View File

@@ -66,8 +66,8 @@ public function list(Request $request): JsonResponse
// 월별 합계
$totals = [
'business_km' => $logs->whereIn('trip_type', ['commute_to', 'commute_from', 'business'])->sum('distance_km'),
'personal_km' => $logs->where('trip_type', 'personal')->sum('distance_km'),
'business_km' => $logs->whereIn('trip_type', ['commute_to', 'commute_from', 'business', 'commute_round', 'business_round'])->sum('distance_km'),
'personal_km' => $logs->whereIn('trip_type', ['personal', 'personal_round'])->sum('distance_km'),
'total_km' => $logs->sum('distance_km'),
];
@@ -90,7 +90,7 @@ public function store(Request $request): JsonResponse
'vehicle_id' => 'required|integer|exists:corporate_vehicles,id',
'log_date' => 'required|date',
'driver_name' => 'required|string|max:50',
'trip_type' => 'required|in:commute_to,commute_from,business,personal',
'trip_type' => 'required|in:commute_to,commute_from,business,personal,commute_round,business_round,personal_round',
'distance_km' => 'required|integer|min:0',
]);
@@ -131,7 +131,7 @@ public function update(Request $request, int $id): JsonResponse
$request->validate([
'log_date' => 'required|date',
'driver_name' => 'required|string|max:50',
'trip_type' => 'required|in:commute_to,commute_from,business,personal',
'trip_type' => 'required|in:commute_to,commute_from,business,personal,commute_round,business_round,personal_round',
'distance_km' => 'required|integer|min:0',
]);
@@ -234,8 +234,8 @@ public function export(Request $request): StreamedResponse
}
// 합계
$businessKm = $logs->whereIn('trip_type', ['commute_to', 'commute_from', 'business'])->sum('distance_km');
$personalKm = $logs->where('trip_type', 'personal')->sum('distance_km');
$businessKm = $logs->whereIn('trip_type', ['commute_to', 'commute_from', 'business', 'commute_round', 'business_round'])->sum('distance_km');
$personalKm = $logs->whereIn('trip_type', ['personal', 'personal_round'])->sum('distance_km');
$totalKm = $logs->sum('distance_km');
$sheet->setCellValue('A' . $row, '합계');