From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/repository/SatisfactionRepository.java | 12 +++++++-----
1 files changed, 7 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 5b0a284..fa37237 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,16 +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);
- 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);
+ Optional<Float> getAgentScoreAvg(@Param("agent_no") String agentNo);
}
--
Gitblit v1.8.0