From 68426f6bb5976e4852dfdb82f55fcb0e4fd9703a Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期四, 21 九月 2023 18:58:48 +0800
Subject: [PATCH] Merge branch 'rx-0918-完善资料' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java |   13 ++++++++++++-
 1 files changed, 12 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..0efd929 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,20 @@
 
     /**
      * 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
-     * 杩斿洖鎺ュ彛Result.success(data); data鏄釜map,key涓哄憳宸ユ爣璇�,value鏄噾棰�
      */
     @PostMapping("/admin/export/employee/oldNew/report")
     Result oldNewReport(@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);
+
 }

--
Gitblit v1.8.0