From 03de56ea7f37d564c4be7ae28c7230236d4e2b6f Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 6 Feb 2025 11:51:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auto/entity/CoreDatasetTableField.java    | 30 ++++++++++++++++++-
 .../mapper/CoreDatasetTableFieldMapper.java   |  2 +-
 .../resources/db/desktop/V2.10.6__ddl.sql     |  5 ++++
 .../resources/db/migration/V2.10.6__ddl.sql   |  5 ++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql
 create mode 100644 core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java
index de0197ecd9..4e3b27d2d7 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/entity/CoreDatasetTableField.java
@@ -9,7 +9,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author fit2cloud
- * @since 2024-08-07
+ * @since 2025-02-06
  */
 @TableName("core_dataset_table_field")
 public class CoreDatasetTableField implements Serializable {
@@ -66,6 +66,16 @@ public class CoreDatasetTableField implements Serializable {
      */
     private String fieldShortName;
 
+    /**
+     * 分组设置
+     */
+    private String groups;
+
+    /**
+     * 未分组的值
+     */
+    private String otherGroup;
+
     /**
      * 维度/指标标识 d:维度，q:指标
      */
@@ -211,6 +221,22 @@ public class CoreDatasetTableField implements Serializable {
         this.fieldShortName = fieldShortName;
     }
 
+    public String getGroups() {
+        return groups;
+    }
+
+    public void setGroups(String groups) {
+        this.groups = groups;
+    }
+
+    public String getOtherGroup() {
+        return otherGroup;
+    }
+
+    public void setOtherGroup(String otherGroup) {
+        this.otherGroup = otherGroup;
+    }
+
     public String getGroupType() {
         return groupType;
     }
@@ -328,6 +354,8 @@ public class CoreDatasetTableField implements Serializable {
         ", description = " + description +
         ", dataeaseName = " + dataeaseName +
         ", fieldShortName = " + fieldShortName +
+        ", groups = " + groups +
+        ", otherGroup = " + otherGroup +
         ", groupType = " + groupType +
         ", type = " + type +
         ", size = " + size +
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java
index f4d97206d7..16d3de3b8c 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/dao/auto/mapper/CoreDatasetTableFieldMapper.java
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author fit2cloud
- * @since 2024-08-07
+ * @since 2025-02-06
  */
 @Mapper
 public interface CoreDatasetTableFieldMapper extends BaseMapper<CoreDatasetTableField> {
diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql
new file mode 100644
index 0000000000..a91c0b2670
--- /dev/null
+++ b/core/core-backend/src/main/resources/db/desktop/V2.10.6__ddl.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `groups` longtext NULL;
+
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `other_group` longtext NULL;
diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql
new file mode 100644
index 0000000000..e25c8f1f76
--- /dev/null
+++ b/core/core-backend/src/main/resources/db/migration/V2.10.6__ddl.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `groups` longtext NULL COMMENT '分组设置' AFTER `field_short_name`;
+
+ALTER TABLE `core_dataset_table_field`
+    ADD COLUMN `other_group` longtext NULL COMMENT '未分组的值' AFTER `groups`;