From 20c86767e4adeea95a131c8f5f8f7d29a67f83f7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 26 十二月 2023 17:34:32 +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 | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 624e212..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
@@ -9,7 +9,7 @@
/**
- * 鍜ㄨ甯堟棩琛�
+ * 鍜ㄨ甯堟棩鎶�
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
@@ -82,4 +82,28 @@
@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);
+
}
--
Gitblit v1.8.0