From 5b443b1effd44548cf6e7c7215153c24fff68558 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Wed, 9 Jun 2021 23:08:25 +0800
Subject: [PATCH] fix

---
 .../web/controller/UserProjectController.java |  2 +-
 .../request/QueryProjectResultRequest.java    | 40 +++++++++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
index 47ee775..6766b87 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
@@ -277,7 +277,7 @@ public class UserProjectController {
      */
     private UserProjectItemEntity formatProjectItem(OperateProjectItemRequest request) {
         //把Map转换成Bean 在转换成Map 去除不在bean字段列表的多字段
-        Object bean = BeanUtil.mapToBean(request.getExpand(), request.getType().getExpandClass(), true);
+        Object bean = BeanUtil.fillBeanWithMap(request.getExpand(), request.getType().getExpandClass(),false);
         UserProjectItemEntity entity = new UserProjectItemEntity();
         BeanUtil.copyProperties(request, entity, UserProjectItemEntity.Fields.defaultValue);
         entity.setExpand(BeanUtil.beanToMap(bean));
diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
index a32e533..d3ceeab 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/request/QueryProjectResultRequest.java
@@ -1,7 +1,9 @@
 package com.tduck.cloud.project.request;
 
 import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.util.StrUtil;
 import com.tduck.cloud.common.entity.PageRequest;
+import com.tduck.cloud.common.util.JsonUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -9,6 +11,7 @@ import lombok.experimental.FieldNameConstants;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.Map;
 
 /**
@@ -33,11 +36,42 @@ public class QueryProjectResultRequest extends PageRequest {
     private LocalDateTime endDateTime;
 
 
-
     /**
-     * 动态字段
+     * 动态字段 参数json
+     */
+    private String extParams;
+    /**
+     * 动态字段比较符 参数json
      */
-    private Map<String, Object> extParams;
+    private String extComparisons;
+
+    public Map<String, Object> getExtParamsMap() {
+        if (StrUtil.isNotEmpty(extParams)) {
+            return JsonUtils.jsonToMap(extParams);
+        }
+        return null;
+    }
+
+
+    public Map<String, Object> getExtComparisonsMap() {
+        if (StrUtil.isNotEmpty(extComparisons)) {
+            return JsonUtils.jsonToMap(extComparisons);
+        }
+        return null;
+    }
+
+    @AllArgsConstructor
+    public enum QueryComparison {
+        EQ("eq", "="),
+        LIKE("like", "like");
+
+        private String name;
+        private String key;
+
+        public static QueryComparison get(String name) {
+            return Arrays.stream(QueryComparison.values()).filter(item -> item.name.equals(name)).findFirst().get();
+        }
+    }
 
 
 }