合并实例与实例模板

OpenAuth.Repository/Domain/FlowInstance.cs

@@ -26,7 +26,13 @@ namespace OpenAuth.Repository.Domain
           this.ActivityId= string.Empty;
           this.ActivityName= string.Empty;
           this.PreviousId= string.Empty;
+          this.SchemeContent= string.Empty;
+          this.SchemeId= string.Empty;
+          this.DbName= string.Empty;
           this.FrmType= 0;
+          this.FrmContentData= string.Empty;
+          this.FrmContentParse= string.Empty;
+          this.FrmId= string.Empty;
           this.SchemeType= string.Empty;
           this.Disabled= 0;
           this.CreateDate= DateTime.Now;
@@ -66,10 +72,34 @@ namespace OpenAuth.Repository.Domain
 	    /// 前一个ID
 	    /// </summary>
         public string PreviousId { get; set; }
+        /// <summary>
+	    /// 流程模板内容
+	    /// </summary>
+        public string SchemeContent { get; set; }
+        /// <summary>
+	    /// 流程模板ID
+	    /// </summary>
+        public string SchemeId { get; set; }
+        /// <summary>
+	    /// 数据库名称
+	    /// </summary>
+        public string DbName { get; set; }
         /// <summary>
 	    /// 表单类型
 	    /// </summary>
         public int FrmType { get; set; }
+        /// <summary>
+	    /// 表单中的字段数据
+	    /// </summary>
+        public string FrmContentData { get; set; }
+        /// <summary>
+	    /// 表单内容
+	    /// </summary>
+        public string FrmContentParse { get; set; }
+        /// <summary>
+	    /// 表单ID
+	    /// </summary>
+        public string FrmId { get; set; }
         /// <summary>
 	    /// 流程类型
 	    /// </summary>

OpenAuth.Repository/Domain/FlowInstanceScheme.cs

@@ -1,57 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a CodeSmith Template.
-//
-//     DO NOT MODIFY contents of this file. Changes to this
-//     file will be lost if the code is regenerated.
-//     Author:Yubao Li
-// </autogenerated>
-//------------------------------------------------------------------------------
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenAuth.Repository.Domain
-{
-    /// <summary>
-	/// 工作流实例模板对应表，防止创建实例后原模板被改
-	/// </summary>
-    public partial class FlowInstanceScheme : Entity
-    {
-        public FlowInstanceScheme()
-        {
-          this.SchemeContent= string.Empty;
-          this.SchemeId= string.Empty;
-          this.SchemeVersion= string.Empty;
-          this.CreateDate= DateTime.Now;
-          this.CreateUserId= string.Empty;
-          this.CreateUserName= string.Empty;
-        }
-
-        /// <summary>
-	    /// 流程模板内容
-	    /// </summary>
-        public string SchemeContent { get; set; }
-        /// <summary>
-	    /// 流程模板ID
-	    /// </summary>
-        public string SchemeId { get; set; }
-        /// <summary>
-	    /// 流程内容版本
-	    /// </summary>
-        public string SchemeVersion { get; set; }
-        /// <summary>
-	    /// 创建时间
-	    /// </summary>
-        public System.DateTime CreateDate { get; set; }
-        /// <summary>
-	    /// 创建用户主键
-	    /// </summary>
-        public string CreateUserId { get; set; }
-        /// <summary>
-	    /// 创建用户
-	    /// </summary>
-        public string CreateUserName { get; set; }
-
-    }
-}

OpenAuth.Repository/Domain/Form.cs

@@ -27,7 +27,7 @@ namespace OpenAuth.Repository.Domain
           this.Content= string.Empty;
           this.SortCode= 0;
           this.Delete= 0;
-          this.FrmDbId= string.Empty;
+          this.DbName= string.Empty;
           this.Enabled= 0;
           this.Description= string.Empty;
           this.CreateDate= DateTime.Now;
@@ -55,7 +55,7 @@ namespace OpenAuth.Repository.Domain
 	    /// </summary>
         public string ContentParse { get; set; }
         /// <summary>
-	    /// 表单原html模板未经处理的，仅仅用作编辑修改
+	    /// 表单原html模板未经处理的
 	    /// </summary>
         public string Content { get; set; }
         /// <summary>
@@ -67,9 +67,9 @@ namespace OpenAuth.Repository.Domain
 	    /// </summary>
         public int Delete { get; set; }
         /// <summary>
-	    /// 数据库Id
+	    /// 数据库名称
 	    /// </summary>
-        public string FrmDbId { get; set; }
+        public string DbName { get; set; }
         /// <summary>
 	    /// 有效
 	    /// </summary>