From 519f912a6e0720929216a088ba82fd3e8b3c7595 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期二, 19 三月 2024 17:12:22 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java | 16 +++++
phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java | 16 +++++
phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java | 32 ++++++++++
phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java | 34 +++++++++++
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java | 19 ++++++
phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java | 18 ++++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 10 +-
phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java | 16 +++++
8 files changed, 156 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index 5863f34..d080635 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -59,15 +59,15 @@
/**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
private Integer cardPass = 0;
- /**璧犻�佸埌璐︾敤鎴�*/
+ /**璧犻�佸埌璐︾敤鎴�-锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseUserId;
- /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級*/
+ /**璧犻�佸鍊奸噾锛堟敞鎰忥細浼犱簡灏遍�侊級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private BigDecimal giveIncrease;
- /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級*/
+ /**璧犻�佸鍊奸噾鍒拌处瑙勫垯锛圡oneyRule锛夛紙浼犱簡灏变娇鐢紝鍚﹀垯灏遍粯璁わ級锛堜笉瑕佷娇鐢紝浼氬垹闄わ級*/
private String giveIncreaseId;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-鏍囬锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseTitle;
- /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛�*/
+ /**璧犻�佹爣棰橈紙棰嗗彇璁板綍灞曠ず-璇︽儏锛夛紙涓嶈浣跨敤锛屼細鍒犻櫎锛�*/
private String giveIncreaseInfo;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
index c48d119..05f0770 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SLabelService.java
@@ -3,6 +3,7 @@
import com.hx.resultTool.Result;
import com.hz.his.dto.PageDto;
import com.hz.his.dto.label.LabelTypePageDto;
+import com.hz.his.vo.label.LabelFindVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -28,4 +29,19 @@
@PostMapping(value = "/label/info/list")
Result getLabelInfoList(@RequestBody(required = false)PageDto pageDto);
+
+ /**
+ * 鑾峰彇鏍囩鍒嗙被鏍戠姸鍚爣绛撅紙鏍规嵁鑼冨洿鑾峰彇锛�
+ * @return Result鐨刣ata杞垚LabelTypeVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/type/tree/by-label")
+ Result getLabelTypeTreeByLabel(@RequestBody LabelFindVo labelFindVo);
+
+ /**鏍规嵁鑼冨洿鑾峰彇
+ * 鑾峰彇鐢ㄦ埛鏍囩
+ * @return Result鐨刣ata杩斿洖鐨勬牸寮忥細key鍊硷細鍒嗙被鏍囪瘑锛泇alue:LabelVo鐨勯泦鍚�
+ */
+ @PostMapping(value = "/label/user/label")
+ Result getLabelUserLabel(@RequestBody LabelFindVo labelFindVo);
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
new file mode 100644
index 0000000..ae63cc7
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelFindVo.java
@@ -0,0 +1,16 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelFindVo {
+
+ /**鑼冨洿鏍囪瘑*/
+ private String rangeCode;
+ /**鐢ㄦ埛鏍囪瘑*/
+ private String userId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
new file mode 100644
index 0000000..cef6ca0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelTypeVo.java
@@ -0,0 +1,32 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelTypeVo {
+
+ /**鏍囩鍒嗙被鏍囪瘑*/
+ private String id;
+ /**鏍囩鍒嗙被鍚嶇О*/
+ private String name;
+
+ /**鏍囩闆嗗悎*/
+ private List<LabelVo> labelList;
+ /**瀛愮被*/
+ private List<LabelTypeVo> childList = new ArrayList<>();
+
+
+ public LabelTypeVo() {
+ }
+
+ public LabelTypeVo(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
new file mode 100644
index 0000000..c63bd87
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/LabelVo.java
@@ -0,0 +1,34 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class LabelVo {
+
+ /**鏍囩鏍囪瘑*/
+ private String id;
+ /**鏍囩鍚嶇О*/
+ private String name;
+ /**鏄惁鑷畾涔夋爣绛撅細0鍚�1鏄�*/
+ private Integer isCustom;
+
+ public LabelVo() {
+ }
+
+ public LabelVo(String id, String name) {
+ this.id = id;
+ this.name = name;
+ }
+
+ public LabelVo(String id, String name, Integer isCustom) {
+ this.id = id;
+ this.name = name;
+ this.isCustom = isCustom;
+ }
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
new file mode 100644
index 0000000..ecad2f9
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelInfoVo.java
@@ -0,0 +1,16 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelInfoVo {
+ /**鏄惁鑷畾涔夛細0鍚�1鏄�-蹇呭～*/
+ private Integer isCustom;
+ /**绯荤粺鏍囩鏍囪瘑-閫夊～锛坕sCustom鏄�0蹇呭～锛�*/
+ private String labelId;
+ /**鏍囩鏍囪瘑-閫夊～锛坕sCustom鏄�1蹇呭～锛�*/
+ private String labelName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
new file mode 100644
index 0000000..a3c2105
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelTypeVo.java
@@ -0,0 +1,19 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelTypeVo {
+
+ /**绯荤粺鏍囩鍒嗙被鏍囪瘑-蹇呭～*/
+ private String labelTypeId;
+ /**鐢ㄦ埛鏍囩闆嗗悎*/
+ private List<UserLabelInfoVo> userLabelList;
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java
new file mode 100644
index 0000000..aa6e881
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/label/UserLabelVo.java
@@ -0,0 +1,18 @@
+package com.hz.his.vo.label;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author CJH
+ */
+@Data
+public class UserLabelVo {
+ /**鎵�灞炵敤鎴�-蹇呭～*/
+ private String userId;
+ /**鑼冨洿鏍囪瘑-蹇呭～*/
+ private String rangeCode;
+ /**鐢ㄦ埛鏍囩鍒嗙被闆嗗悎*/
+ private List<UserLabelTypeVo> userLabelTypeList;
+}
--
Gitblit v1.8.0