From 566a0871ca258e2ed8e8028b6d0e0d657d065c64 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 02 六月 2023 18:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java | 24 ++++++++++++++++++++++++
2 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
index 772a66c..5d1e9d1 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/deduction/DeductionDto.java
@@ -2,6 +2,8 @@
import lombok.Data;
+import java.util.List;
+
/**
* @ClassName DeductionDto
* @Description 鍒掓墸
@@ -20,4 +22,6 @@
private Integer isCustomerConfirm;
/**娌荤枟閫氱煡鍗曟不鐤楅」鐩甶d*/
private String treatProjectId;
+ /**椤圭洰id鍒楄〃*/
+ private List<String> projectIds;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java
new file mode 100644
index 0000000..04f790f
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiCashierDetailService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform.bi;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.report.CashierSettlementDto;
+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-cashier-detail")
+public interface BiCashierDetailService {
+
+ /**
+ * 鍑虹撼缁撶畻鍒楄〃
+ */
+ @PostMapping("/cashier/detail/common/list")
+ Result cashierDetailList(@RequestBody CashierSettlementDto cashierSettlementDto);
+
+
+}
--
Gitblit v1.8.0