From b832880e1fcf3307387d53106078498f68a95853 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 05 三月 2024 16:59:02 +0800
Subject: [PATCH] 移除TestLoginResource

---
 pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 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 b345b5f..d1af1d5 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,44 +2,51 @@
 
 import java.util.List;
 
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
+import com.pollex.pam.business.enums.SatisfactionTypeEnum;
 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;
+import com.pollex.pam.business.domain.Satisfaction;
+import com.pollex.pam.business.security.SecurityUtils;
+import com.pollex.pam.business.service.SatisfactionService;
+import com.pollex.pam.business.service.dto.SatisfactionCustomerScoreDTO;
+import com.pollex.pam.business.service.dto.SatisfactionDTO;
 
 @RestController
 @RequestMapping("/api/satisfaction")
 public class SatisfactionResource {
-	
+
 	private final Logger log = LoggerFactory.getLogger(SatisfactionResource.class);
 
-	
+
 	@Autowired
 	SatisfactionService satisfactionService;
-	
+
+    @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_FILL_SATISFACTION)
 	@PostMapping("/score")
 	public Satisfaction scorefaction(@RequestBody SatisfactionCustomerScoreDTO scoreDTO) {
 		return satisfactionService.scorefaction(scoreDTO);
 	}
-	
+
+    @AuditLoggingInject(type = AuditLoggingType.CUSTOMER_FILL_SATISFACTION)
+    @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());
 		}

--
Gitblit v1.8.0