From f4dd14d80b2a1565fabf835f8e05a8458b873ba8 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期三, 19 一月 2022 18:58:49 +0800 Subject: [PATCH] [BUG] 預約單結案未修改預約單最後溪改時間(todo : 134359) --- pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java index 7a303c6..dd2fc14 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java @@ -82,11 +82,27 @@ ClosedProcessDTO dto = new ClosedProcessDTO(); BeanUtils.copyProperties(closeDTO, dto); abstractAppointmentProcess.process(dto); + }else { + return ResponseEntity.notFound().build(); } -// Appointment ap = appointmentService.findById(closeDTO.getAppointmentId()); -// System.out.println("getClosedInfo().getClosedOtherReason()::"+ap.getClosedInfo().getClosedOtherReason()); + return ResponseEntity.noContent().build(); + } + + @PostMapping("/close/info/edit") + public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) { + if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) { + DoneProcessDTO dto = new DoneProcessDTO(); + BeanUtils.copyProperties(closeDTO, dto); + abstractAppointmentProcess.editClosedInfo(dto); + }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){ + ClosedProcessDTO dto = new ClosedProcessDTO(); + BeanUtils.copyProperties(closeDTO, dto); + abstractAppointmentProcess.editClosedInfo(dto); + }else { + return ResponseEntity.notFound().build(); + } return ResponseEntity.noContent().build(); } -- Gitblit v1.8.0