From 488b475c1f574b26b5f4f4d5ea928f0d33e1d641 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 08 八月 2022 15:04:06 +0800
Subject: [PATCH] DCP标签修改
---
phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java | 8 ++++++++
phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
index 113ab33..d6bd1a5 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/dcp/UserTagInfoDto.java
@@ -3,6 +3,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.util.List;
+
@Data
@EqualsAndHashCode(callSuper = true)
public class UserTagInfoDto extends BaseDto{
@@ -22,6 +24,12 @@
/**鏍囩绫诲埆*/
private String tagTypeName;
+ /**鏍囩鏍囪瘑鍖归厤鎼滅储*/
+ private List<String> tagIdAndList;
+
+ /**鏍囩鏍囪瘑鍖呭惈鎼滅储*/
+ private List<String> tagIdOrList;
+
public UserTagInfoDto() {
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
index 7ebbb7b..bd99279 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/dcp/SUserTagInfoService.java
@@ -1,5 +1,6 @@
package com.hz.his.feign.service.dcp;
+import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import com.hz.his.dto.dcp.TagRuleInfoItemDto;
import com.hz.his.dto.dcp.UserTagInfoDto;
@@ -38,12 +39,12 @@
* }
*/
@PostMapping(value = "/user/tag/info/edit")
- Result edit(@RequestBody String data);
+ Result edit(@RequestBody JSONObject data);
/**鏍囩鍒嗙被鏍戝舰鏁版嵁 鏁版嵁妗堜緥锛歿"ascription":["customer","project","product","card","employee","promotion"]}*/
@PostMapping("/tag/rule/info/tree/data")
- Result tagTypeTreeData(@RequestBody String data);
+ Result tagTypeTreeData(@RequestBody JSONObject data);
/**鏍囩鍒楄〃*/
@PostMapping("/tag/rule/item/list")
--
Gitblit v1.8.0