From c4dd23bd31f954d0132e995018c4f528f37ffa92 Mon Sep 17 00:00:00 2001
From: ANDRU-PC\Andru <769883346@qq.com>
Date: 星期一, 21 八月 2023 16:44:01 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/EmployeeReportDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java | 42 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 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 d33f678..500b7d8 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;
@@ -35,4 +36,7 @@
private Integer isBothOne;
/**宸ヤ綔鏃�*/
private Integer workDayNum;
+ /**鎿嶄綔浜�*/
+ private String operatorId;
+ private String operatorName;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
new file mode 100644
index 0000000..b8ec30d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiArriveReportService.java
@@ -0,0 +1,42 @@
+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-arrive-report")
+public interface BiArriveReportService {
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁
+ */
+ @PostMapping("/report/arrive/shop/list")
+ Result shopDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�
+ */
+ @PostMapping("/report/arrive/employee/list")
+ Result empDataList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-闂ㄥ簵鏁版嵁-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/shop/list/export")
+ Result shopDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 棰勭害鍒拌鍒嗘瀽-鍜ㄨ甯�-瀵煎嚭
+ */
+ @PostMapping("/report/arrive/employee/list/export")
+ Result empDataListExport(@RequestBody EmployeeReportDto employeeReportDto);
+
+
+}
--
Gitblit v1.8.0