From efe28af6e1689ed5bd7edbd57b02421863fe8793 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期五, 12 一月 2024 17:17:15 +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 | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 3 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 7 +++++++
4 files changed, 22 insertions(+), 0 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 3ebb4ca..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
@@ -106,4 +106,10 @@
@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);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
index 5b0b0ff..7c3a3f9 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java
@@ -129,4 +129,11 @@
*/
@PostMapping("/admin/consultant/report/project/loss/list/V2")
Result projectLossListV2(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 涓夊ぇ椤圭洰鎵ц鏁版嵁
+ */
+ @PostMapping("/admin/consultant/report/relation/project/list")
+ Result relationProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index 4f2b120..26a3fcf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -56,4 +56,10 @@
@PostMapping("/admin/user/deduction/report/shop/emp/list")
Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 闂ㄥ簵-涓夊ぇ椤圭洰鎵ц鏁版嵁
+ */
+ @PostMapping("/admin/export/shop/relation/project/list/day")
+ Result relationProjectList(@RequestBody ShopReportDto shopReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
index 8acf876..8552ce7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java
@@ -99,5 +99,8 @@
@PostMapping("/admin/export/shop/room/list")
Result roomList(@RequestBody ShopReportDto shopReportDto);
+ /**闂ㄥ簵-涓夊ぇ椤圭洰鎵ц鏁版嵁*/
+ @PostMapping("/admin/export/shop/relation/project/list/sale")
+ Result relationProjectList(@RequestBody ShopReportDto shopReportDto);
}
--
Gitblit v1.8.0