fix issue #I62YDO 保存拖拽表单默认增加InstanceId，方便取关卡的审批意见等信息

Infrastructure/Define.cs

@@ -28,5 +28,7 @@
         public const string DATAPRIVILEGE_LOGINORG = "{loginOrg}";  //数据权限配置中，当前登录用户部门的key
 
         public const string JOBMAPKEY = "OpenJob";
+
+        public const string DEFAULT_FORM_INSTANCE_ID_NAME = "InstanceId";
     }
 }

OpenAuth.App/FlowInstance/FlowInstanceApp.cs

@@ -156,6 +156,14 @@ namespace OpenAuth.App
                         continue;
                     }
                     
+                    //讲流程实例ID赋值到表单数据表中，实现表单记录与流程实例关联
+                    if (column.ColumnName == Define.DEFAULT_FORM_INSTANCE_ID_NAME)
+                    {
+                        columnstr += $"{Define.DEFAULT_FORM_INSTANCE_ID_NAME},";
+                        valstr += "'" + flowInstance.Id + "',";
+                        continue;
+                    }
+                    
                     var val = json[column.ColumnName];
                     if (val == null)
                     {

OpenAuth.App/Form/DragForm.cs

@@ -33,6 +33,7 @@ namespace OpenAuth.App
                 if (exist != null) return string.Empty;
                 // 如果数据库没有指定的表，则创建表
                 StringBuilder sql = new StringBuilder($"CREATE TABLE {tableName} (   [Id] varchar(50) COLLATE Chinese_PRC_CI_AS NOT NULL,"); //主键
+                sql.Append($"[{Define.DEFAULT_FORM_INSTANCE_ID_NAME}] varchar(50) COLLATE Chinese_PRC_CI_AS,");  //默认加上FlowinstanceId字段，记录关联的流程实例ID
                 string sqlDefault = "";
                 foreach (var json in jsonArray)
                 {
@@ -65,6 +66,7 @@ namespace OpenAuth.App
                 if (exist != null) return string.Empty;
                 // 如果数据库没有指定的表，则创建表
                 StringBuilder sql = new StringBuilder($"create table if not exists `{tableName}` ( Id varchar(50) not null primary key,"); //主键
+                sql.Append($"`{Define.DEFAULT_FORM_INSTANCE_ID_NAME}` varchar(50),");  //默认加上FlowinstanceId字段，记录关联的流程实例ID
                 foreach (var json in jsonArray)
                 {
                     string type = json["type"].ToString();