From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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 9f59e61..9911f04 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/SatisfactionService.java
@@ -40,27 +40,32 @@
@Autowired
CustomerRepository customerRepository;
-
+
@Autowired
ConsultantRepository consultantRepository;
-
+
@Autowired
ConsultantService consultantService;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
public Satisfaction save(Satisfaction satisfaction) {
satisfaction = satisfactionRepository.save(satisfaction);
consultantService.setConsultantAvgScore(satisfaction);
return satisfaction;
}
-
+
public Satisfaction scorefaction(SatisfactionCustomerScoreDTO scoreDTO) {
Optional<Satisfaction> satisfactionOP = getByAppointmentId(scoreDTO.getAppointmentId());
Satisfaction satisfaction = satisfactionOP.orElseThrow(SatisfactionNotFoundException::new);
satisfaction.setScore(scoreDTO.getScore());
satisfaction.setStatus(SatisfactionStatusEnum.FILLED);
- return save(satisfaction);
+ save(satisfaction);
+ personalNotificationService.createScorefactionToConsultant(satisfaction);
+ return satisfaction;
}
-
+
public Satisfaction createSatisfaction(Appointment appointment) {
boolean isexist = getByAppointmentId(appointment.getId()).isPresent();
if(isexist) {
@@ -89,6 +94,10 @@
return satisfactionRepository.findOneByAppointmentId(appointmentId);
}
+ public List<Satisfaction> getByStatus(SatisfactionStatusEnum status) {
+ return satisfactionRepository.findAllByStatus(status);
+ }
+
public List<Satisfaction> scoreAllfaction(List<SatisfactionCustomerScoreDTO> scoreDTO) {
List<Satisfaction> satisfactionList = new ArrayList<>();
scoreDTO.stream().forEach(dto ->{
--
Gitblit v1.8.0