From 686fd4015c676c57e238bfd765d5daa1b2dbc3d8 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 12 十二月 2022 17:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java | 27 +++++++++
phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java | 27 +++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java | 41 +++++++++++++
phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java | 27 +++++++++
4 files changed, 122 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
new file mode 100644
index 0000000..e159665
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/SExportService.java
@@ -0,0 +1,41 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.file.FileExUpdateDto;
+import com.hz.his.dto.file.FileExportDto;
+import com.hz.his.vo.bi.exp.CashierSettlementVo;
+import com.hz.his.vo.bi.exp.CashierSurfaceVo;
+import com.hz.his.vo.bi.exp.DeductionSurfaceVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**bi鐨勫鍑虹▼搴�
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phiskin-bi-view-user",path = "/bi-view",contextId = "bi-export")
+public interface SExportService {
+
+ /**
+ * 瀵煎嚭鍑虹撼缁撶畻琛�
+ * 鏃犺浆鎹�
+ */
+ @PostMapping(value = "/exp/cashier/settlement")
+ Result cashierSettlement(@RequestBody CashierSettlementVo cashierSettlementVo);
+
+ /**
+ * 瀵煎嚭鏀堕摱鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/cashier/surface")
+ Result cashierSurface(@RequestBody CashierSurfaceVo cashierSurfaceVo);
+
+ /**
+ * 瀵煎嚭鍒掓墸鎶ヨ〃
+ * 杞崲鏃�
+ */
+ @PostMapping(value = "/exp/deduction/surface")
+ Result deductionSurface(@RequestBody DeductionSurfaceVo deductionSurfaceVo);
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java
new file mode 100644
index 0000000..68461dc
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSettlementVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鍑虹撼缁撶畻
+ * @author CJH
+ */
+@Data
+public class CashierSettlementVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java
new file mode 100644
index 0000000..f581f7d
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/CashierSurfaceVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鏀堕摱鎶ヨ〃
+ * @author CJH
+ */
+@Data
+public class CashierSurfaceVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java
new file mode 100644
index 0000000..2a20847
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/bi/exp/DeductionSurfaceVo.java
@@ -0,0 +1,27 @@
+package com.hz.his.vo.bi.exp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**鍒掓墸鎶ヨ〃
+ * @author CJH
+ */
+@Data
+public class DeductionSurfaceVo {
+
+ /********鏌ヨ鏉′欢*********/
+ /**涓嬪崟鏃堕棿-寮�濮�*/
+ private Date startTime;
+ /**涓嬪崟鏃堕棿-缁撴潫*/
+ private Date endTime;
+ /**鎵�灞為棬搴�*/
+ private String shopId;
+
+ /*******淇濆瓨鍙傛暟********/
+ /**鎿嶄綔浜烘爣璇�*/
+ private String operatorId;
+ /**鎿嶄綔浜�*/
+ private String operatorName;
+
+}
--
Gitblit v1.8.0