From 1b0e079da40b36dd97a6d48cdf79df88573d621c Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 20 Dec 2024 17:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deploy/backend/workflow/dto/WorkflowDefinitionDTO.java    | 4 ++++
 .../deploy/backend/workflow/entity/WorkflowDefinition.java    | 4 ++--
 .../src/main/resources/db/migration/V1.0.0__init_schema.sql   | 2 +-
 backend/src/main/resources/db/migration/V1.0.1__init_data.sql | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
index 992efdcf..4062a6db 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowDefinitionDTO.java
@@ -1,5 +1,6 @@
 package com.qqchen.deploy.backend.workflow.dto;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.qqchen.deploy.backend.framework.dto.BaseDTO;
 import com.qqchen.deploy.backend.workflow.dto.definition.workflow.WorkflowDefinitionGraph;
 import com.qqchen.deploy.backend.workflow.enums.WorkflowCategoryEnum;
@@ -60,6 +61,9 @@ public class WorkflowDefinitionDTO extends BaseDTO {
      */
     private WorkflowDefinitionStatusEnums status;
 
+
+    private JsonNode formVariablesSchema;
+
     /**
      * 流程描述
      */
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowDefinition.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowDefinition.java
index 91d29537..83ec81e1 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowDefinition.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowDefinition.java
@@ -80,8 +80,8 @@ public class WorkflowDefinition extends Entity<Long> {
      * 表单配置
      */
     @Type(JsonType.class)
-    @Column(name = "form_config", columnDefinition = "json")
-    private JsonNode formConfig;
+    @Column(name = "form_variables_schema", columnDefinition = "json")
+    private JsonNode formVariablesSchema;
 
     /**
      * 流程状态
diff --git a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql
index 450f0444..40a90e37 100644
--- a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql
+++ b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql
@@ -416,7 +416,7 @@ CREATE TABLE workflow_definition
 	-- 流程配置
 	bpmn_xml              TEXT COMMENT 'BPMN XML内容',
 	graph                 JSON COMMENT '流程图数据，包含节点和连线的位置、样式等信息',
-	form_config           JSON COMMENT '表单配置',
+	form_variables_schema JSON COMMENT '表单配置',
 	tags                  JSON COMMENT '流程标签',
 
 	-- 流程属性
diff --git a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql
index 8f2ce930..908effef 100644
--- a/backend/src/main/resources/db/migration/V1.0.1__init_data.sql
+++ b/backend/src/main/resources/db/migration/V1.0.1__init_data.sql
@@ -160,7 +160,7 @@ INSERT INTO workflow_definition (
     -- 基础信息
     name, `key`, process_definition_id, flow_version, description, category, triggers,
     -- 流程配置
-    graph, form_config, tags,
+    graph, form_variables_schema, tags,
     -- 流程属性
     status, is_executable, target_namespace,
     -- 审计字段