From becc7f3f5f3e424a02deaa1a5849f830d6ed7da7 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 18:25:58 +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/BiUserService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 6f18fed..342e5bd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.report.UserReportDto;
import com.hz.his.dto.report.UserReportListDto;
+import com.hz.his.dto.user.UserDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -41,10 +42,22 @@
Result deductionList(@RequestBody UserReportDto userReportDto);
/**
+ * 椤圭洰娑堣垂棰戞鍜屾笚閫忕巼-瀵煎嚭娓楅�忔湭鎵ц
+ */
+ @PostMapping("/admin/user/report/deduction/list/export")
+ Result deductionListExport(@RequestBody UserReportDto userReportDto);
+
+ /**
* 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩
*/
@PostMapping("/admin/user/report/treat/tag/list")
Result treatTagList(@RequestBody UserReportDto userReportDto);
+
+ /**
+ * 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩-瀵煎嚭
+ */
+ @PostMapping("/admin/user/report/treat/tag/list/export")
+ Result treatTagListExport(@RequestBody UserReportDto userReportDto);
/**
* 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩
@@ -52,6 +65,16 @@
@PostMapping("/admin/user/report/treat/mj/tag/list")
Result treatMjTagList(@RequestBody UserReportDto userReportDto);
+ /**
+ * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩-瀵煎嚭
+ */
+ @PostMapping("/admin/user/report/treat/mj/tag/list/export")
+ Result treatMjTagListExport(@RequestBody UserReportDto userReportDto);
+ /**
+ * 瀹㈡埛璧勬枡鍗�
+ */
+ @PostMapping("/admin/user/info/card/detail")
+ Result userInfoCardDetail(@RequestBody UserDto userDto);
}
--
Gitblit v1.8.0