From 1690df135fe42b1a22d4866c5d55470b3dcaeb7e Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期四, 14 三月 2024 11:32:56 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/report/UserDetailReportDto.java | 32 ++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java | 35 +++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java | 6 +++
3 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/report/UserDetailReportDto.java b/phis-feign/src/main/java/com/hz/his/dto/report/UserDetailReportDto.java
new file mode 100644
index 0000000..dad6797
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/report/UserDetailReportDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.report;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛鎶ヨ〃鎵╁睍
+ * @author fwq
+ * */
+@Data
+public class UserDetailReportDto {
+ /**鏄犲皠妯″潡*/
+ private Integer moduleType;
+ /**杩囨护娴嬭瘯璐﹀彿*/
+ private Integer isFilterTestAccount;
+
+ /**寮�濮嬫椂闂�*/
+ private String startTime;
+ /**缁撴潫鏃堕棿*/
+ private String endTime;
+
+ /**闂ㄥ簵鏍囪瘑*/
+ private List<String> shopIdList;
+ /**闂ㄥ簵缂栧彿*/
+ private List<String> shopNoList;
+ /**椤鹃棶鏍囪瘑*/
+ private List<String> adviserIdList;
+ /**椤鹃棶缂栧彿*/
+ private List<String> adviserNoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
index b959c4d..c7ef81b 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipDeductionService.java
@@ -71,4 +71,10 @@
*/
@PostMapping(value = "/deduction/postoperative/card/info")
Result postoperativeCardInfo(@RequestBody DeductionDto dto);
+
+ /**
+ * 鏇存柊鍒掓墸鍥剧墖
+ */
+ @PostMapping(value = "/deduction/update/deduction/picture")
+ Result updateDeductionPicture(@RequestBody DeductionDto dto);
}
\ No newline at end of file
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 342e5bd..2fe0bb2 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
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform.bi;
import com.hx.resultTool.Result;
+import com.hz.his.dto.report.UserDetailReportDto;
import com.hz.his.dto.report.UserReportDto;
import com.hz.his.dto.report.UserReportListDto;
import com.hz.his.dto.user.UserDto;
@@ -77,4 +78,38 @@
@PostMapping("/admin/user/info/card/detail")
Result userInfoCardDetail(@RequestBody UserDto userDto);
+ /**
+ * rfm瀹㈡埛姒傝-浼氬憳鏁伴噺
+ */
+ @PostMapping("/admin/rfmUser/report/total/list")
+ Result totalList(@RequestBody UserDetailReportDto userDetailReportDto);
+ /**
+ * rfm瀹㈡埛姒傝-RFM鍒嗗�间汉鏁�
+ */
+ @PostMapping("/admin/rfmUser/report/score/list")
+ Result scoreList(@RequestBody UserDetailReportDto userDetailReportDto);
+ /**
+ * rfm瀹㈡埛姒傝-瀹㈢兢鏁版嵁
+ */
+ @PostMapping("/admin/rfmUser/report/group/list")
+ Result groupList(@RequestBody UserDetailReportDto userDetailReportDto);
+ /**
+ * rfm瀹㈡埛姒傝-鎵ц椤圭洰鏁版嵁
+ */
+ @PostMapping("/admin/rfmUser/report/deduction/list")
+ Result deductionList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+ /**
+ * rfm瀹㈡埛姒傝-棰滃�艰鍒掓爣绛句俊鎭�
+ */
+ @PostMapping("/admin/rfmUser/report/label/list")
+ Result labelList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+ /**
+ * rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃
+ */
+ @PostMapping("/admin/rfmUser/report/user/search/list")
+ Result userSearchList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+
}
--
Gitblit v1.8.0