From 9cb6d5f92ad7aeda45ad1fe6482dcfc63d17be2b Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期一, 06 十二月 2021 12:35:26 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/mapper/SatisfactionMapper.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..97669a7 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
@@ -5,18 +5,33 @@
import java.util.List;
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()).get();
+ target.setAgentName(consultant.getName());
+ Customer customer = customerRepository.findById(source.getCustomerId()).get();
+ target.setCustomerName(customer.getName());
return target;
}
--
Gitblit v1.8.0