From e4cf174db3dc02713bb0af0788a02bacba6a89fc Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 18 八月 2023 10:54:44 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantDayService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java | 3 +++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 4 ++++
4 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
index 3ad3d52..861f8aa 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/OperationalStatementsVo.java
@@ -19,7 +19,10 @@
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ /**闂ㄥ簵鏍囪瘑闆嗗悎*/
private List<String> shopIdList;
+ /**娓犻亾澶х被娓犻亾鏍囪瘑闆嗗悎*/
+ private List<String> channelList;
/**寮�濮嬫椂闂�*/
private Date startTime;
/**缁撴潫鏃堕棿*/
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 1fb954c..0380043 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
@@ -88,4 +88,10 @@
@PostMapping("/admin/export/employee/oldNew/report")
Result oldNewReport(@RequestBody EmployeeReportDto employeeReportDto);
+ /**
+ * 鍜ㄨ甯�-棰勭害鍛ㄦ湡鎶ヨ〃
+ */
+ @PostMapping("/admin/export/employee/cycle/week/list")
+ Result cycleWeekList(@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 6f2fbd0..c484ce3 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
@@ -116,5 +116,9 @@
@PostMapping("/admin/consultant/report/room/list")
Result roomList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-鍜ㄨ甯�-鍒濊瘖鎴愪氦鐜� */
+ @PostMapping("/admin/consultant/report/first/user/rate/export")
+ Result firstRateListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
new file mode 100644
index 0000000..0dfd38e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSourceService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 鍜ㄨ甯堣瘎鍒嗘姤琛�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-consultant-source")
+public interface BiConsultantSourceService {
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃 */
+ @PostMapping("/admin/consultant/report/source/list")
+ Result empSourceList(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+ /*** 鍜ㄨ甯�-璇勫垎鍒楄〃-瀵煎嚭 */
+ @PostMapping("/admin/consultant/report/emp/source/export")
+ Result empSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+
+ /*** 鍜ㄨ甯�-鎺掑悕-瀵煎嚭 */
+ @PostMapping("/admin/consultant/report/shop/emp/source/export")
+ Result shopEmpSourceExport(@RequestBody(required = false) EmployeeReportDto employeeReportDto);
+
+
+}
\ No newline at end of file
--
Gitblit v1.8.0