From aa0f9381d424b98e86845c6da21e2fd8640fe056 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期一, 21 二月 2022 18:32:45 +0800 Subject: [PATCH] [update] 若顧問狀態非啟用時,則搜尋及推薦會找不到該顧問 --- pamapi/src/main/java/com/pollex/pam/web/rest/SatisfactionResource.java | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 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..92baf43 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,49 +2,47 @@ import java.util.List; +import com.pollex.pam.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; @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()); } -- Gitblit v1.8.0