From 1de2c28dff2e02dcff6f1632ace4b084a6eca7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Fri, 6 Jan 2023 15:36:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=B3=E8=AF=B7=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=8A=93=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/mortals/xhx/module/app/model/vo/AppDatasetVo.java | 8 ++++++--
.../com/mortals/httpclient/app/AppDatasetController.http | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
index fc5c6815..4fff8582 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/app/model/vo/AppDatasetVo.java
@@ -34,10 +34,14 @@ public class AppDatasetVo extends BaseEntityLong {
private List<Long> idList;
+ private List<String> fieldNameList;
+
+ private List<String> fieldValueList;
+
/** OR鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疧R锛岄」鍐呭涔嬮棿鏄疉ND锛屽锛�(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
- private List<AppDatasetEntity> orConditionList;
+ private List<AppDatasetQuery> orConditionList;
/** AND鏉′欢闆嗗悎锛屽垪琛ㄩ」涔嬮棿鏄疉ND锛岄」鍐呭涔嬮棿鏄疧R锛屽锛�(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
- private List<AppDatasetEntity> andConditionList;
+ private List<AppDatasetQuery> andConditionList;
}
\ No newline at end of file
diff --git a/base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http b/base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
index e8eb1b33..381cb0d5 100644
--- a/base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
+++ b/base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http
@@ -31,7 +31,7 @@ Content-Type: application/json
{
"appId": 20,
- "andConditionList": [
+ "orConditionList": [
{
"fieldName": "鍒跺畾鏈哄叧",
"fieldValue": "%鍥涘窛鐪佷汉姘戞斂搴�%"
--
2.24.3