From 59cba8e75716def66ca996c3162e7e6792048444 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期二, 15 二月 2022 09:39:45 +0800 Subject: [PATCH] Fixed#135358 修正[ 顧問管理流程 ] 結案明細 : 編輯結案明細,由成交編輯為未成交,內容依然顯示成交的 ID 和 商品 Plan Code、進件時間 --- 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..1e670a3 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); - 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); -- Gitblit v1.8.0