From a795efd3882285bc9feb54168b4712a34e2c9d7f Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 10 八月 2022 17:36:48 +0800
Subject: [PATCH] 修改
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 10 ++++++++--
phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPhisPackageDto.java | 13 ++++++-------
phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPackageDto.java | 21 +++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/user/UserIdsDto.java | 12 ++++++++++++
4 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/UserIdsDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/UserIdsDto.java
new file mode 100644
index 0000000..8c15c11
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/UserIdsDto.java
@@ -0,0 +1,12 @@
+package com.hz.his.dto.user;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**鐢ㄦ埛鏍囪瘑闆嗗悎*/
+@Data
+public class UserIdsDto extends PageDto {
+ private List<String> idList;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPackageDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPackageDto.java
new file mode 100644
index 0000000..ee57643
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPackageDto.java
@@ -0,0 +1,21 @@
+package com.hz.his.dto.user.packages;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 鏌ヨ浜虹兢鍖呭垪琛�
+ * */
+@Data
+public class UserPackageDto extends PageDto {
+
+ /**鏍囩鍚嶇О闆嗗悎-鏌CP*/
+ private List<String> labelNameList;
+
+ /**鍏朵粬鏉′欢-鏌his*/
+ private UserPhisPackageDto userPhisPackageDto;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java b/phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPhisPackageDto.java
similarity index 74%
rename from phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
rename to phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPhisPackageDto.java
index 8f2fb3b..03e3a85 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/user/project/UserPackageDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/user/packages/UserPhisPackageDto.java
@@ -1,4 +1,4 @@
-package com.hz.his.dto.user.project;
+package com.hz.his.dto.user.packages;
import com.hz.his.dto.PageDto;
import lombok.Data;
@@ -10,16 +10,15 @@
* 鏌ヨ浜虹兢鍖呭垪琛�
* */
@Data
-public class UserPackageDto extends PageDto {
-
- /**鏍囩鍚嶇О闆嗗悎*/
- private List<String> labelNameList;
+public class UserPhisPackageDto extends PageDto {
+ /**鏌ヨ绫诲瀷:0涓嶅甫idList,1甯dList*/
+ private Integer type;
+ /**鏍囩鍚嶇О闆嗗悎-鏌CP*/
+ private List<String> labelSelectList;
/**椤圭洰鏍囪瘑闆嗗悎*/
private List<String> projectIdList;
/**浼氬憳绛夌骇鍚嶇О闆嗗悎*/
private List<String> memberLevelList;
- /**id闆嗗悎*/
- private List<String> idList;
/**鐢ㄦ埛鍒涘缓鏃堕棿寮�濮�*/
private String createStartTime;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index f9a5f91..c58512e 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.user.UserAppointmentDto;
import com.hz.his.dto.user.UserDto;
+import com.hz.his.dto.user.UserIdsDto;
import com.hz.his.dto.user.UserLevelDto;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
@@ -12,7 +13,8 @@
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.label.UserLabelDto;
-import com.hz.his.dto.user.project.UserPackageDto;
+import com.hz.his.dto.user.packages.UserPackageDto;
+import com.hz.his.dto.user.packages.UserPhisPackageDto;
import com.hz.his.dto.user.project.UserProjectDto;
import com.hz.his.dto.user.project.UserProjectUsedDto;
import com.hz.his.dto.user.promotion.UserPromotionUsedDto;
@@ -226,6 +228,10 @@
* 鑾峰彇浜虹兢鍖呭垪琛�(鍙紶绛涢�夌殑鍙傛暟:浼氬憳绛夌骇,鍋氳繃鐨勯」鐩�,浼氬憳鍒涘缓鏃堕棿,鏈�鍚庝竴娆℃秷璐规椂闂�,鏈�鍚庝竴娆″埌搴楁椂闂�)
* */
@PostMapping(value = "/user/package/list")
- Result userPackageList(@RequestBody UserPackageDto userPackageDto);
+ Result userPackageList(@RequestBody UserPhisPackageDto userPhisPackageDto);
+
+ /**鏍规嵁鏍囪瘑闆嗗悎绛涢�夌敤鎴�*/
+ @PostMapping(value = "/user/idList/list")
+ Result userIdSelectList(@RequestBody UserIdsDto userIdsDto);
}
\ No newline at end of file
--
Gitblit v1.8.0