From 0e50884553dd11fa72101f23ac51143c9f98a871 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期三, 22 五月 2024 11:37:15 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into fhx-prod-智能导诊

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
index c643bd3..afa0b5e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java
@@ -9,7 +9,7 @@
 
 
 /**
- * 鍜ㄨ甯堟棩琛�
+ * 鍜ㄨ甯堟棩鎶�
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
 @FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
@@ -17,12 +17,14 @@
 
     /**
      * 鍜ㄨ甯�-鍚勪笟缁╂寚鏍囨暟鎹�
+     * EmployeeAchievementVo
      */
     @PostMapping("/admin/export/employee/indicators/list")
     Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
      * 鍜ㄨ甯�-鍒濊瘖鎯呭喌
+     *  EmployeeFirstTreatVo
      */
     @PostMapping("/admin/export/employee/first/treat/list")
     Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
@@ -30,6 +32,7 @@
 
     /**
      * 鍜ㄨ甯�-鍒拌鏈垚浜ゅ悕鍗�
+     *
      */
     @PostMapping("/admin/export/employee/first/treat/user/list")
     Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
@@ -79,4 +82,34 @@
     @PostMapping("/admin/export/employee/user/member/distribution/proportion")
     Result memberDistributionProportion(@RequestBody UserReleaseDto userReleaseDto);
 
+    /**
+     * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
+     */
+    @PostMapping("/admin/export/employee/oldNew/report")
+    Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁╂帓鍚嶇涓�鐨勫憳宸�
+     */
+    @PostMapping("/admin/export/employee/oldNew/top/employee")
+    Result oldNewReportTopEmployee(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃
+     */
+    @PostMapping("/admin/export/employee/cycle/week/list")
+    Result cycleWeekList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃-瀵煎嚭
+     */
+    @PostMapping("/admin/export/employee/cycle/week/list/export")
+    Result cycleWeekListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍜ㄨ甯�-涓夊ぇ椤圭洰鎵ц鏁版嵁
+     */
+    @PostMapping("/admin/export/employee/relation/project/list")
+    Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
 }

--
Gitblit v1.8.0