From 551d18a095e8fe462e4099fdd5b2578e12934d45 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 08 二月 2022 12:25:44 +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/web/rest/SatisfactionResource.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java
index 092579b..2289880 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java
@@ -2,53 +2,57 @@
import java.util.List;
+import com.pollex.pam.enums.SatisfactionTypeEnum;
+import com.pollex.pam.service.dto.SatisfactionSystemScoreDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SatisfactionService;
import com.pollex.pam.service.dto.SatisfactionCustomerScoreDTO;
import com.pollex.pam.service.dto.SatisfactionDTO;
-import com.pollex.pam.service.dto.SatisfactionUpdateDTO;
@RestController
@RequestMapping("/api/satisfaction")
public class SatisfactionResource {
-
+
private final Logger log = LoggerFactory.getLogger(SatisfactionResource.class);
-
+
@Autowired
SatisfactionService satisfactionService;
-
+
@PostMapping("/score")
public Satisfaction scorefaction(@RequestBody SatisfactionCustomerScoreDTO scoreDTO) {
return satisfactionService.scorefaction(scoreDTO);
}
-
+
@PostMapping("/score/all")
public List<Satisfaction> scoreAllfaction(@RequestBody List<SatisfactionCustomerScoreDTO> scoreDTO) {
return satisfactionService.scoreAllfaction(scoreDTO);
}
-
+
@GetMapping("/getMySatisfaction")
public List<SatisfactionDTO> getMySatisfaction(){
if(StringUtils.hasText(SecurityUtils.getAgentNo())) {
- return satisfactionService.getByAgentNo(SecurityUtils.getAgentNo());
+ return satisfactionService.getByAgentNoAndType(SecurityUtils.getAgentNo(), SatisfactionTypeEnum.APPOINTMENT);
}else if(SecurityUtils.getCustomerDBId()!=null){
- return satisfactionService.getByCustomerId(SecurityUtils.getCustomerDBId());
+ return satisfactionService.getByCustomerIdAndType(SecurityUtils.getCustomerDBId(), SatisfactionTypeEnum.APPOINTMENT);
}
log.error("Not has agent code and customer id");
throw new IllegalArgumentException("Not has agent code and customer id");
}
+
+ @PostMapping("/system/score")
+ public Satisfaction createSystemSatisfaction(@RequestBody SatisfactionSystemScoreDTO scoreDTO) {
+ return satisfactionService.createSystemSatisfaction(scoreDTO);
+ }
}
--
Gitblit v1.8.0