From 06d3a2b2801ecaaa60a3427a70a8179164ffedb9 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 16 二月 2022 16:44:38 +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/service/mapper/SatisfactionMapper.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
index d83505c..8a757a4 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java
@@ -3,20 +3,36 @@
import static java.util.stream.Collectors.toList;
import java.util.List;
+import java.util.Objects;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.pollex.pam.domain.Consultant;
+import com.pollex.pam.domain.Customer;
import com.pollex.pam.domain.Satisfaction;
+import com.pollex.pam.repository.ConsultantRepository;
+import com.pollex.pam.repository.CustomerRepository;
import com.pollex.pam.service.dto.SatisfactionDTO;
@Service
public class SatisfactionMapper {
-
+
+ @Autowired
+ ConsultantRepository consultantRepository;
+
+ @Autowired
+ CustomerRepository customerRepository;
+
public SatisfactionDTO toDTO(Satisfaction source) {
SatisfactionDTO target = new SatisfactionDTO();
- target.setScore(source.getScore());
BeanUtils.copyProperties(source, target);
+ target.setScore(source.getScore());
+ Consultant consultant= consultantRepository.findOneByAgentNo(source.getAgentNo()).orElse(null);
+ target.setAgentName(Objects.isNull(consultant) ? null : consultant.getName());
+ Customer customer = customerRepository.findById(source.getCustomerId()).get();
+ target.setCustomerName(customer.getName());
return target;
}
--
Gitblit v1.8.0