From 531e742da2d55892f85641b07fdf4a61b1262eb0 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 26 九月 2023 15:22:52 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-fwq-phis下载中心
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java | 22 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java | 38 +++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java | 2 +
phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java | 2 +
5 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java
new file mode 100644
index 0000000..8a6b6dd
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/activityData/ActivityReportDto.java
@@ -0,0 +1,38 @@
+package com.hz.his.dto.activityData;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * 鍗囧崟鎶ヨ〃dto
+ * @USER: fhx
+ * @DATE: 2023/9/25
+ **/
+@Data
+public class ActivityReportDto extends PageDto {
+
+ /** 鎶ュ憡id */
+ private String reportId;
+ /** 鐢ㄦ埛鍚� */
+ private String name;
+ /** 娓犻亾 */
+ private String channel;
+ /** 娓犻亾 */
+ private String channelName;
+ /** 娓犻亾 */
+ private String channelName2;
+ /** 钀ラ攢椤圭洰鍚嶇О */
+ private String marketProjectName;
+ /** 鍜ㄨ甯堝悕绉� */
+ private String consultName;
+ /** 鍖荤敓鍚嶇О */
+ private String doctorName;
+ //寮�濮嬫椂闂�
+ private String startTime;
+ //缁撴潫鏃堕棿
+ private String endTime;
+ /** 鎿嶄綔浜烘爣璇� */
+ private String operatorId;
+ /** 鎿嶄綔浜� */
+ private String operatorName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
index d8ab8f4..bb6528e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/CoreProjectReportDto.java
@@ -32,4 +32,6 @@
private String loginCnName;
/**鐧诲綍鍛樺伐鍞竴瀛楃涓�*/
private String loginEmpStr;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
}
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 500b7d8..a7127cf 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
@@ -39,4 +39,6 @@
/**鎿嶄綔浜�*/
private String operatorId;
private String operatorName;
+ /**鏄惁杩囨护娴嬭瘯璐﹀彿鏁版嵁:0涓嶈繃婊�,1杩囨护*/
+ private Integer isFilterTestAccount;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
index 9bf67f6..8560f79 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/ShopCashReportDto.java
@@ -19,6 +19,8 @@
private String endTime;
/**闂ㄥ簵鍒楄〃鏍囪瘑*/
private List<String> shopIdList;
+ /** 鏄惁杩囨护娴嬭瘯鐢ㄦ埛璐﹀彿 */
+ private Integer isFilterTestAccount;
/**涓氱哗绫诲瀷-闂ㄥ簵鏃ョ幇閲戜笟缁�*/
public static final String TYPE_DAY_CASH= "day_cash";
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
new file mode 100644
index 0000000..3ab1a6f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiActivityReportService.java
@@ -0,0 +1,22 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.activityData.ActivityReportDto;
+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-activity-report")
+public interface BiActivityReportService {
+
+ /**
+ * 瀵煎嚭
+ */
+ @PostMapping("/activity/report/export")
+ Result export(@RequestBody ActivityReportDto activityReportDto);
+}
--
Gitblit v1.8.0