From 765007dcc802b0539124cb4c780de665e6665509 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期六, 06 五月 2023 14:56:25 +0800
Subject: [PATCH] Merge branch 'master' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index 957fe39..e918438 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -5,82 +5,93 @@
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 
 /**
  * 鍜ㄨ甯堥攢鍞揩鎶ユ姤琛�
  * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
  */
-@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-shop-day")
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-sale")
 public interface BiConsultantSaleService {
 
     /**
      * 鍜ㄨ甯�-涓氱哗鎬诲垪琛�
      */
-    @PostMapping("/admin/export/employee/deduction/total/list")
+    @PostMapping("/admin/consultant/report/deduction/total/list")
     Result deductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-鎵ц涓氱哗蹇姤
      */
-    @PostMapping("/admin/export/employee/deduction/detail/list")
+    @PostMapping("/admin/consultant/report/deduction/detail/list")
     Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
 
 
     /**
      * 鍜ㄨ甯�-鍒濊瘖绠�鎶�
      */
-    @PostMapping("/admin/export/employee/first/treat/list")
+    @PostMapping("/admin/consultant/report/first/treat/list")
     Result firstTreatList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-棰勭害鍒拌瘖
      */
-    @PostMapping("/admin/export/employee/appointment/arrive/list")
+    @PostMapping("/admin/consultant/report/appointment/arrive/list")
     Result  appointmentArriveList(@RequestBody EmployeeReportDto employeeReportDto);
 
 
     /**
      * 鍜ㄨ甯�-鑰佸甫鏂扮畝鎶�
      */
-    @PostMapping("/admin/export/employee/old/new/list")
+    @PostMapping("/admin/consultant/report/old/new/list")
     Result  oldLeadNew(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-浼氬憳鍙樺姩鏁版嵁
      */
-    @PostMapping("/admin/export/employee/level/change/list")
+    @PostMapping("/admin/consultant/report/level/change/list")
     Result levelChangeList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-瀛ｅ害娲昏穬瀹㈡埛
      */
-    @PostMapping("/admin/export/employee/active/user/list")
+    @PostMapping("/admin/consultant/report/active/user/list")
     Result activeUserList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-娴佸け瀹㈡埛
      */
-    @PostMapping("/admin/export/employee/loss/user/list")
+    @PostMapping("/admin/consultant/report/loss/user/list")
     Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗗瓙棰勮
+     */
+    @PostMapping("/admin/consultant/report/loss/user/list/numerator")
+    Result lossUserNumeratorList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗘瘝棰勮
+     */
+    @PostMapping("/admin/consultant/report/loss/user/list/denominator")
+    Result lossUserDenominatorList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-鏍稿績椤圭洰
      */
-    @RequestMapping("/admin/export/employee/core/project/list")
+    @PostMapping("/admin/consultant/report/core/project/list")
     Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-娌夌潯瀹㈡墽琛屼笟缁�
      */
-    @RequestMapping("/admin/export/employee/user/sleep/deduction/list")
+    @PostMapping("/admin/consultant/report/user/sleep/deduction/list")
     Result userSleepDeductionList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-鍖荤敓鎵ц鍗犳瘮鏁版嵁鍒楄〃
      */
-    @RequestMapping("/admin/export/employee/user/doctor/deduction/list")
+    @PostMapping("/admin/consultant/report/user/doctor/deduction/list")
     Result userDoctorDeductionList(@RequestBody EmployeeReportDto employeeReportDto);
 
 

--
Gitblit v1.8.0