From 463ba2f5b7e5ae094c33b1692a74b7f7aa58aad5 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期二, 08 二月 2022 12:20:56 +0800 Subject: [PATCH] [add] [todo 134582] 系統滿意度填寫api --- pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java index 9911f04..0fa1b91 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java @@ -4,6 +4,9 @@ import java.util.List; import java.util.Optional; +import com.pollex.pam.enums.SatisfactionTypeEnum; +import com.pollex.pam.security.SecurityUtils; +import com.pollex.pam.service.dto.SatisfactionSystemScoreDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -61,17 +64,18 @@ Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new); satisfaction.setScore(scoreDTO.getScore()); satisfaction.setStatus(SatisfactionStatusEnum.FILLED); + satisfaction.setType(SatisfactionTypeEnum.APPOINTMENT); save(satisfaction); personalNotificationService.createScorefactionToConsultant(satisfaction); return satisfaction; } - public Satisfaction createSatisfaction(Appointment appointment) { + public Satisfaction createAppointmentSatisfaction(Appointment appointment) { boolean isexist = getByAppointmentId(appointment.getId()).isPresent(); if(isexist) { throw new SatisfactionAlreadyExistException(); } - Satisfaction satisfaction = appointmentMapper.toSatisfaction(appointment); + Satisfaction satisfaction = appointmentMapper.toAppointmentSatisfaction(appointment); return save(satisfaction); } // @@ -80,13 +84,13 @@ // return save(satisfaction); // } - public List<SatisfactionDTO> getByAgentNo(String agentNo) { - List<Satisfaction> satisfactionList = satisfactionRepository.findByAgentNo(agentNo); + public List<SatisfactionDTO> getByAgentNoAndType(String agentNo, SatisfactionTypeEnum type) { + List<Satisfaction> satisfactionList = satisfactionRepository.findByAgentNoAndType(agentNo, type); return satisfactionMapper.toDTO(satisfactionList); } - public List<SatisfactionDTO> getByCustomerId(Long customerDBId) { - List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerId(customerDBId); + public List<SatisfactionDTO> getByCustomerIdAndType(Long customerDBId, SatisfactionTypeEnum type) { + List<Satisfaction> satisfactionList = satisfactionRepository.findByCustomerIdAndType(customerDBId, type); return satisfactionMapper.toDTO(satisfactionList); } @@ -94,8 +98,8 @@ return satisfactionRepository.findOneByAppointmentId(appointmentId); } - public List<Satisfaction> getByStatus(SatisfactionStatusEnum status) { - return satisfactionRepository.findAllByStatus(status); + public List<Satisfaction> getByStatusAndType(SatisfactionStatusEnum status, SatisfactionTypeEnum type) { + return satisfactionRepository.findAllByStatusAndType(status, type); } public List<Satisfaction> scoreAllfaction(List<SatisfactionCustomerScoreDTO> scoreDTO) { @@ -105,4 +109,14 @@ }); return satisfactionList; } + + public Satisfaction createSystemSatisfaction(SatisfactionSystemScoreDTO scoreDTO) { + Satisfaction satisfaction = new Satisfaction(); + satisfaction.setCustomerId(SecurityUtils.getCustomerDBId()); + satisfaction.setAppointmentId(scoreDTO.getAppointmentId()); + satisfaction.setStatus(SatisfactionStatusEnum.FILLED); + satisfaction.setScore(scoreDTO.getScore()); + satisfaction.setType(SatisfactionTypeEnum.SYSTEM); + return satisfactionRepository.save(satisfaction); + } } -- Gitblit v1.8.0