diff --git a/backend/src/main/java/com/srsystem/controller/EmployeeController.java b/backend/src/main/java/com/srsystem/controller/EmployeeController.java index 27db93e..6b68b26 100644 --- a/backend/src/main/java/com/srsystem/controller/EmployeeController.java +++ b/backend/src/main/java/com/srsystem/controller/EmployeeController.java @@ -100,7 +100,7 @@ public class EmployeeController { return ResponseEntity.ok(ApiResponse.ok("직원이 등록되었습니다", created)); } - @Operation(summary = "직원 정보 수정", description = "기본 정보(이름/이메일/전화번호/생년월일/학력/전공/졸업일/거주지/프로필사진) 수정") + @Operation(summary = "직원 정보 수정", description = "기본 정보(이름/이메일/전화번호/입사일/직급/프로필사진/사수) 수정") @PreAuthorize("hasRole('ADMIN')") @PutMapping("/{empId}") public ResponseEntity> update( diff --git a/backend/src/main/java/com/srsystem/dto/EmployeeSearchResult.java b/backend/src/main/java/com/srsystem/dto/EmployeeSearchResult.java index b82be8b..1eb0ca9 100644 --- a/backend/src/main/java/com/srsystem/dto/EmployeeSearchResult.java +++ b/backend/src/main/java/com/srsystem/dto/EmployeeSearchResult.java @@ -4,6 +4,7 @@ public record EmployeeSearchResult( Long empId, String name, String email, - String department + String roleCode, + String dispatchStatus ) { } diff --git a/backend/src/main/java/com/srsystem/service/EmployeeService.java b/backend/src/main/java/com/srsystem/service/EmployeeService.java index a08eb2a..9ce0a22 100644 --- a/backend/src/main/java/com/srsystem/service/EmployeeService.java +++ b/backend/src/main/java/com/srsystem/service/EmployeeService.java @@ -75,6 +75,7 @@ public class EmployeeService { e.getEmpId(), e.getName(), e.getEmail(), + e.getRoleCode() != null ? e.getRoleCode().name() : null, e.getDispatchStatus() != null ? e.getDispatchStatus().name() : null ); } diff --git a/backend/src/main/java/com/srsystem/util/PhoneEncryptionConverter.java b/backend/src/main/java/com/srsystem/util/PhoneEncryptionConverter.java index bc68c8c..92d1d78 100644 --- a/backend/src/main/java/com/srsystem/util/PhoneEncryptionConverter.java +++ b/backend/src/main/java/com/srsystem/util/PhoneEncryptionConverter.java @@ -21,8 +21,8 @@ public class PhoneEncryptionConverter implements AttributeConverter>(`/tickets/${ticketId}/comments/${commentId}`); }, + + getPendingApprovals() { + return apiClient.get>('/tickets/pending'); + }, + + approveTicket(ticketId: number) { + return apiClient.post>(`/tickets/${ticketId}/approve`); + }, + + rejectTicket(ticketId: number, reason: string) { + return apiClient.post>(`/tickets/${ticketId}/reject`, { reason }); + }, + + reopenTicket(ticketId: number) { + return apiClient.post>(`/tickets/${ticketId}/reopen`); + }, }; export default ticketService; diff --git a/src/types/index.ts b/src/types/index.ts index 6801654..1a1c24a 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -126,9 +126,7 @@ export interface IssueTicket { ticketId: number; projectId?: number; projectName?: string; - requesterId: number; requesterName?: string; - assigneeId: number | null; assigneeName?: string | null; category: TicketCategory; priority: TicketPriority; @@ -138,12 +136,11 @@ export interface IssueTicket { dueDate: string | null; resolvedAt: string | null; resolutionNote: string | null; - slaWarnFlag: 'Y' | 'N'; - isImminent?: boolean; + slaWarnFlag: boolean; createdAt: string; - updatedAt: string; attachmentUrl?: string; attachmentName?: string; + isImminent?: boolean; approverId?: number; backupApproverId?: number; approvedBy?: number;