From 74527e7ce6ab1a5e09d3d4936e5157188e983e49 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 05 二月 2024 16:12:21 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 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 1fb954c..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
@@ -88,4 +88,28 @@
     @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