From 85d1dc328bd46089b63b57bd356908cbba26e29c Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期一, 23 十月 2023 16:45:19 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 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 c643bd3..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
@@ -9,7 +9,7 @@
/**
- * 鍜ㄨ甯堟棩琛�
+ * 鍜ㄨ甯堟棩鎶�
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-day")
@@ -17,12 +17,14 @@
/**
* 鍜ㄨ甯�-鍚勪笟缁╂寚鏍囨暟鎹�
+ * EmployeeAchievementVo
*/
@PostMapping("/admin/export/employee/indicators/list")
Result indicators(@RequestBody EmployeeReportDto employeeReportDto);
/**
* 鍜ㄨ甯�-鍒濊瘖鎯呭喌
+ * EmployeeFirstTreatVo
*/
@PostMapping("/admin/export/employee/first/treat/list")
Result firstTreat(@RequestBody EmployeeReportDto employeeReportDto);
@@ -30,6 +32,7 @@
/**
* 鍜ㄨ甯�-鍒拌鏈垚浜ゅ悕鍗�
+ *
*/
@PostMapping("/admin/export/employee/first/treat/user/list")
Result firstTreatUser(@RequestBody EmployeeReportDto employeeReportDto);
@@ -79,4 +82,22 @@
@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/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