From 0df5ae8d2c51acf91eb256b9c88477f93f29de25 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 24 四月 2023 10:52:26 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java | 12 ++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 12 ++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
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 ef01088..e918438 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
@@ -65,6 +65,18 @@
Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
/**
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗗瓙棰勮
+ */
+ @PostMapping("/admin/consultant/report/loss/user/list/numerator")
+ Result lossUserNumeratorList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 鍜ㄨ甯�-娴佸け瀹㈡埛鍒嗘瘝棰勮
+ */
+ @PostMapping("/admin/consultant/report/loss/user/list/denominator")
+ Result lossUserDenominatorList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
* 鍜ㄨ甯�-鏍稿績椤圭洰
*/
@PostMapping("/admin/consultant/report/core/project/list")
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
index 74c0c8b..d42e81e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiOpeStaService.java
@@ -137,5 +137,17 @@
@PostMapping("/admin/operational/rfm/data/list")
Result rfmDataList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+ /**
+ * 鍚勯棬搴楃幇閲戜笟缁╁畬鎴愭儏鍐�
+ */
+ @PostMapping("/admin/operational/shop/cash/complete/list")
+ Result shopCashCompleteList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
+ /**
+ * 鏈勾搴﹀悇鏈堢幇閲�&鎵ц涓氱哗瀹屾垚鎯呭喌
+ */
+ @PostMapping("/admin/operational/month/deduction/list")
+ Result monthDeductionList(@RequestBody OperationalStatementsVo operationalStatementsVo);
+
}
--
Gitblit v1.8.0