From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
index 28407e3..638aa84 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopSPAService.java
@@ -2,6 +2,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.EmployeeReportDto;
+import com.hz.his.dto.report.PerformanceReqParamsDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +37,30 @@
*/
@PostMapping("/admin/export/shop/spa/project/indicators/list")
Result projectIndicatorsList(@RequestBody ShopReportDto shopReportDto);
+
+
+ /**
+ * SPA闂ㄥ簵鏈堟墽琛屾暟鎹�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/new")
+ Result monthDeductionNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾暟鎹�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new")
+ Result monthDeductionEmpNew(@RequestBody ShopReportDto shopReportDto);
+
+ /**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/list/all")
+ Result monthDeductionEmpList(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
+ /**
+ * SPA闂ㄥ簵-鍛樺伐鏈堟墽琛屾槑缁嗗鍑�
+ */
+ @RequestMapping("admin/export/shop/spa/month/deduction/emp/new/report")
+ Result monthDeductionEmpExport(@RequestBody PerformanceReqParamsDto performanceReqParamsDto);
+
}
--
Gitblit v1.8.0