From c76e8c849181d237cd5825da085b07eb8088a7c9 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 05 七月 2023 17:43:02 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 1 +
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSaleService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiConsultantSaleService.java | 12 ++++++++++++
3 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
index 928ce41..b5515d1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java
@@ -14,6 +14,7 @@
private String employeeId;
/**闂ㄥ簵鏍囪瘑*/
private String shopId;
+ private String shopIds;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String roleStr;
/**鍛樺伐鏍囪瘑闆嗗悎*/
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 85d552e..af1b900 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
@@ -100,4 +100,16 @@
@PostMapping("/admin/consultant/report/user/doctor/deduction/list/month")
Result userDoctorDeductionMonthList(@RequestBody EmployeeReportDto employeeReportDto);
+ /**鍜ㄨ甯�-寰俊钀ラ攢鏁版嵁*/
+ @PostMapping("/admin/consultant/report/weChat/list")
+ Result weChatList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**鍜ㄨ甯�-瀵煎嚭-鏍稿績椤圭洰鎻愬強鐜�*/
+ @PostMapping("/admin/consultant/report/weChat/list/export")
+ Result weChatListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**鍜ㄨ甯�-鍜ㄨ甯�-娴佸け瀹㈡埛瀵煎嚭*/
+ @PostMapping("/admin/consultant/report/loss/user/rate/export")
+ Result lossUserListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
}
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 2f55d29..9bc2b28 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
@@ -89,4 +89,10 @@
@PostMapping("/admin/export/shop/user/doctor/deduction/list/month")
Result userDoctorDeductionMonthList(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-娴佸け瀹㈡埛-瀵煎嚭
+ */
+ @PostMapping("/admin/export/shop/loss/user/rate/export")
+ Result lossUserRate(@RequestBody ShopReportDto shopReportDto);
+
}
--
Gitblit v1.8.0