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/BiShopDayService.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
index 01e26f5..26a3fcf 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java
@@ -1,11 +1,11 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
+import com.hz.his.dto.report.EmployeeReportDto;
import com.hz.his.dto.report.ShopReportDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
/**
@@ -47,7 +47,19 @@
* 鍏跺畠涓氱哗淇℃伅
* ShopOtherVo
*/
- @RequestMapping("/admin/export/shop/other/list")
+ @PostMapping("/admin/export/shop/other/list")
Result otherInAchievement(@RequestBody ShopReportDto shopReportDto);
+ /**
+ * 闂ㄥ簵-鍛樺伐-鐢ㄦ埛鎵ц涓氱哗
+ */
+ @PostMapping("/admin/user/deduction/report/shop/emp/list")
+ Result shopEmpUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+ /**
+ * 闂ㄥ簵-涓夊ぇ椤圭洰鎵ц鏁版嵁
+ */
+ @PostMapping("/admin/export/shop/relation/project/list/day")
+ Result relationProjectList(@RequestBody ShopReportDto shopReportDto);
+
}
--
Gitblit v1.8.0