From 55dc3707715ed7213163f4c8a0bf79c6a6f4dc63 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 21 六月 2023 14:27:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiShopDayService.java | 15 +++++++++++++--
1 files changed, 13 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 c06f6fa..4f2b120 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;
/**
@@ -17,32 +17,43 @@
/**
* 鏃ユ姤琛�-褰撴棩鍒板簵淇℃伅
+ * ArriveShopVo
*/
@PostMapping("/admin/export/shop/day/arriveShop")
Result arriveShop(@RequestBody ShopReportDto shopReportDto);
/**
* 鏃ユ姤琛�-褰撴棩鍚勪笟缁╂寚鏍�
+ * ShopAchievementVo
*/
@PostMapping("/admin/export/shop/day/indicators")
Result indicators(@RequestBody ShopReportDto shopReportDto);
/**
* 鏂拌�佷細鍛樻暟鎹�
+ * ShopOldLeadNewVo
*/
@PostMapping("/admin/export/shop/day/old/lead/new")
Result oldLeadNew(@RequestBody ShopReportDto shopReportDto);
/**
* 閲嶇偣椤圭洰鎸囨爣鏁版嵁
+ * ShopImportantProjectVo
*/
@PostMapping("/admin/export/shop/important/project/indicators/list")
Result importantProjectIndicators(@RequestBody ShopReportDto shopReportDto);
/**
* 鍏跺畠涓氱哗淇℃伅
+ * 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);
+
}
--
Gitblit v1.8.0