From fd6ef3a323aec4aa626a501761af024fd1a0d6d9 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期三, 06 十二月 2023 16:42:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx-营销活动修改' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 19 ++++++++++++++++++-
1 files changed, 18 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..3ebb4ca 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,26 @@
/**
* 鍜ㄨ甯�-鑰佸甫鏂颁笟缁�
- * 杩斿洖鎺ュ彛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);
+
}
--
Gitblit v1.8.0