From e8da7d0b1c9277c5a4fbcd39d5923e2b7249ebf4 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 03 六月 2024 12:10:25 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into chenjiahe-咨询记录(未成交)

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 a5677db..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
@@ -84,9 +84,32 @@
 
     /**
      * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
-     * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
      */
     @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