From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat

---
 pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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 98476e7..fa37237 100644
--- a/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java
+++ b/pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java
@@ -3,6 +3,8 @@
 import java.util.List;
 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;
@@ -13,15 +15,17 @@
 @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);
 
-	Optional<Satisfaction> findOneByAppointmentId(Long appointmentId);
+	Optional<Satisfaction> findOneByAppointmentIdAndType(Long appointmentId, SatisfactionTypeEnum type);
 
-	@Query(value = "SELECT avg(score) FROM satisfaction where agent_no=:agent_no"
+    List<Satisfaction> findAllByStatusAndType(SatisfactionStatusEnum status, SatisfactionTypeEnum type);
+
+	@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);
+	Optional<Float> getAgentScoreAvg(@Param("agent_no") String agentNo);
 }
-	
\ No newline at end of file

--
Gitblit v1.8.0