|
@@ -123,8 +123,6 @@ class ReportController( |
|
|
val nextMonth = request.yearMonth.plusMonths(1).atDay(1) |
|
|
val nextMonth = request.yearMonth.plusMonths(1).atDay(1) |
|
|
|
|
|
|
|
|
val staff = staffRepository.findById(request.id).orElseThrow() |
|
|
val staff = staffRepository.findById(request.id).orElseThrow() |
|
|
println(thisMonth) |
|
|
|
|
|
println(nextMonth) |
|
|
|
|
|
val args: Map<String, Any> = mutableMapOf( |
|
|
val args: Map<String, Any> = mutableMapOf( |
|
|
"staffId" to request.id, |
|
|
"staffId" to request.id, |
|
|
"startDate" to thisMonth, |
|
|
"startDate" to thisMonth, |
|
@@ -132,7 +130,6 @@ class ReportController( |
|
|
) |
|
|
) |
|
|
val timesheets = excelReportService.getTimesheet(args) |
|
|
val timesheets = excelReportService.getTimesheet(args) |
|
|
val leaves = excelReportService.getLeaves(args) |
|
|
val leaves = excelReportService.getLeaves(args) |
|
|
println(leaves) |
|
|
|
|
|
|
|
|
|
|
|
val reportResult: ByteArray = excelReportService.generateStaffMonthlyWorkHourAnalysisReport(thisMonth, staff, timesheets, leaves) |
|
|
val reportResult: ByteArray = excelReportService.generateStaffMonthlyWorkHourAnalysisReport(thisMonth, staff, timesheets, leaves) |
|
|
// val mediaType: MediaType = MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") |
|
|
// val mediaType: MediaType = MediaType.parseMediaType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") |
|
|