From 551d18a095e8fe462e4099fdd5b2578e12934d45 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 08 二月 2022 12:25:44 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3

---
 pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java b/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java
index 5b0a284..b04f9fe 100644
--- a/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java
+++ b/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java
@@ -4,6 +4,7 @@
 import java.util.Optional;
 
 import com.pollex.pam.enums.SatisfactionStatusEnum;
+import com.pollex.pam.enums.SatisfactionTypeEnum;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -14,15 +15,16 @@
 @Repository
 public interface SatisfactionRepository extends JpaRepository<Satisfaction, Long>{
 
-	List<Satisfaction> findByAgentNo(String agentNo);
+	List<Satisfaction> findByAgentNoAndType(String agentNo, SatisfactionTypeEnum type);
 
-	List<Satisfaction> findByCustomerId(Long customerId);
+	List<Satisfaction> findByCustomerIdAndType(Long customerId, SatisfactionTypeEnum type);
 
 	Optional<Satisfaction> findOneByAppointmentId(Long appointmentId);
 
-    List<Satisfaction> findAllByStatus(SatisfactionStatusEnum status);
+    List<Satisfaction> findAllByStatusAndType(SatisfactionStatusEnum status, SatisfactionTypeEnum type);
 
-	@Query(value = "SELECT avg(score) FROM satisfaction where agent_no=:agent_no"
+	@Query(value = "SELECT avg(score) FROM satisfaction where type='APPOINTMENT'"
+            + " and agent_no=:agent_no"
 			+ " and score is not null"
 			, nativeQuery = true)
 	Float getAgentScoreAvg(@Param("agent_no") String agentNo);

--
Gitblit v1.8.0