处理form列表

2025-09-18 09:44:28 +08:00 · 2018-02-28 17:34:27 +08:00
parent 0260031ca1
commit 1763bd7bad
15 changed files with 1120 additions and 1095 deletions
--- a/OpenAuth.Repository/Domain/WFFrmMain.cs
+++ b/OpenAuth.Repository/Domain/WFFrmMain.cs
@@ -16,17 +16,19 @@ namespace OpenAuth.Repository.Domain
    /// <summary>
 	/// 表单模板表
 	/// </summary>
-    public partial class WFFrmMain : Entity
+    public partial class Form : Entity
    {
-        public WFFrmMain()
+        public Form()
        {
-          this.FrmCode= string.Empty;
-          this.FrmName= string.Empty;
-          this.FrmType= string.Empty;
-          this.FrmTable= string.Empty;
-          this.FrmTableId= string.Empty;
-          this.FrmContent= string.Empty;
+          this.Name= string.Empty;
+          this.Fields= 0;
+          this.ContentData= string.Empty;
+          this.ContentParse= string.Empty;
+          this.Content= string.Empty;
+          this.SortCode= 0;
+          this.Delete= 0;
          this.FrmDbId= string.Empty;
+          this.Enabled= 0;
          this.Description= string.Empty;
          this.CreateDate= DateTime.Now;
          this.CreateUserId= string.Empty;
@@ -36,42 +38,34 @@ namespace OpenAuth.Repository.Domain
          this.ModifyUserName= string.Empty;
        }

-        /// <summary>
-	    /// 表单编号
-	    /// </summary>
-        public string FrmCode { get; set; }
        /// <summary>
 	    /// 表单名称
 	    /// </summary>
-        public string FrmName { get; set; }
+        public string Name { get; set; }
        /// <summary>
-	    /// 表单分类
+	    /// 字段个数
 	    /// </summary>
-        public string FrmType { get; set; }
+        public int Fields { get; set; }
        /// <summary>
-	    /// 数据表
+	    /// 表单中的字段数据
 	    /// </summary>
-        public string FrmTable { get; set; }
+        public string ContentData { get; set; }
        /// <summary>
-	    /// 关联表的主键
+	    /// 表单替换的模板 经过处理
 	    /// </summary>
-        public string FrmTableId { get; set; }
+        public string ContentParse { get; set; }
        /// <summary>
-	    /// 是否需要建表0不建表,1建表
+	    /// 表单原html模板未经处理的
 	    /// </summary>
-        public int? IsSystemTable { get; set; }
-        /// <summary>
-	    /// 表单内容
-	    /// </summary>
-        public string FrmContent { get; set; }
+        public string Content { get; set; }
        /// <summary>
 	    /// 排序码
 	    /// </summary>
-        public int? SortCode { get; set; }
+        public int SortCode { get; set; }
        /// <summary>
 	    /// 删除标记
 	    /// </summary>
-        public int? DeleteMark { get; set; }
+        public int Delete { get; set; }
        /// <summary>
 	    /// 数据库Id
 	    /// </summary>
@@ -79,7 +73,7 @@ namespace OpenAuth.Repository.Domain
        /// <summary>
 	    /// 有效
 	    /// </summary>
-        public int? EnabledMark { get; set; }
+        public int Enabled { get; set; }
        /// <summary>
 	    /// 备注
 	    /// </summary>
@@ -87,7 +81,7 @@ namespace OpenAuth.Repository.Domain
        /// <summary>
 	    /// 创建时间
 	    /// </summary>
-        public System.DateTime? CreateDate { get; set; }
+        public System.DateTime CreateDate { get; set; }
        /// <summary>
 	    /// 创建用户主键
 	    /// </summary>
--- a/OpenAuth.Repository/Mapping/WFFrmMainMap.cs
+++ b/OpenAuth.Repository/Mapping/WFFrmMainMap.cs
@@ -12,13 +12,13 @@ using System.ComponentModel.DataAnnotations;

 namespace OpenAuth.Repository.Mapping
 {
-    public partial class WFFrmMainMap
-        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.WFFrmMain>
+    public partial class FormMap
+        : System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.Form>
    {
-        public WFFrmMainMap()
+        public FormMap()
        {
            // table
-            ToTable("WF_FrmMain", "dbo");
+            ToTable("Form", "dbo");

            // keys
            HasKey(t => t.Id);
@@ -28,53 +28,42 @@ namespace OpenAuth.Repository.Mapping
                .HasColumnName("Id")
                .HasMaxLength(50)
                .IsRequired();
-            Property(t => t.FrmCode)
-                .HasColumnName("FrmCode")
-                .HasMaxLength(50)
-                .IsOptional();
-            Property(t => t.FrmName)
-                .HasColumnName("FrmName")
+            Property(t => t.Name)
+                .HasColumnName("Name")
                .HasMaxLength(200)
                .IsOptional();
-            Property(t => t.FrmType)
-                .HasColumnName("FrmType")
-                .HasMaxLength(50)
+            Property(t => t.Fields)
+                .HasColumnName("Fields")
+                .IsRequired();
+            Property(t => t.ContentData)
+                .HasColumnName("ContentData")
                .IsOptional();
-            Property(t => t.FrmTable)
-                .HasColumnName("FrmTable")
-                .HasMaxLength(50)
+            Property(t => t.ContentParse)
+                .HasColumnName("ContentParse")
                .IsOptional();
-            Property(t => t.FrmTableId)
-                .HasColumnName("FrmTableId")
-                .HasMaxLength(50)
-                .IsOptional();
-            Property(t => t.IsSystemTable)
-                .HasColumnName("isSystemTable")
-                .IsOptional();
-            Property(t => t.FrmContent)
-                .HasColumnName("FrmContent")
-                .HasMaxLength(16)
+            Property(t => t.Content)
+                .HasColumnName("Content")
                .IsOptional();
            Property(t => t.SortCode)
                .HasColumnName("SortCode")
-                .IsOptional();
-            Property(t => t.DeleteMark)
-                .HasColumnName("DeleteMark")
-                .IsOptional();
+                .IsRequired();
+            Property(t => t.Delete)
+                .HasColumnName("Delete")
+                .IsRequired();
            Property(t => t.FrmDbId)
                .HasColumnName("FrmDbId")
                .HasMaxLength(50)
                .IsOptional();
-            Property(t => t.EnabledMark)
-                .HasColumnName("EnabledMark")
-                .IsOptional();
+            Property(t => t.Enabled)
+                .HasColumnName("Enabled")
+                .IsRequired();
            Property(t => t.Description)
                .HasColumnName("Description")
                .HasMaxLength(200)
                .IsOptional();
            Property(t => t.CreateDate)
                .HasColumnName("CreateDate")
-                .IsOptional();
+                .IsRequired();
            Property(t => t.CreateUserId)
                .HasColumnName("CreateUserId")
                .HasMaxLength(50)
--- a/OpenAuth.Repository/OpenAuth.Repository.csproj
+++ b/OpenAuth.Repository/OpenAuth.Repository.csproj
@@ -60,6 +60,7 @@
    <Compile Include="Domain\Category.cs" />
    <Compile Include="Domain\CategoryType.cs" />
    <Compile Include="Core\Entity.cs" />
+    <Compile Include="Domain\Form.cs" />
    <Compile Include="Domain\Module.cs" />
    <Compile Include="Domain\ModuleElement.cs" />
    <Compile Include="Domain\Org.cs" />
@@ -69,7 +70,6 @@
    <Compile Include="Domain\Stock.cs" />
    <Compile Include="Domain\User.cs" />
    <Compile Include="Domain\UserExt.cs" />
-    <Compile Include="Domain\WFFrmMain.cs" />
    <Compile Include="Domain\WFProcessInstance.cs" />
    <Compile Include="Domain\WFProcessOperationHistory.cs" />
    <Compile Include="Domain\WFProcessScheme.cs" />
@@ -80,7 +80,7 @@
    <Compile Include="Interface\IUnitWork.cs" />
    <Compile Include="Mapping\ApplicationMap.cs" />
    <Compile Include="Mapping\CategoryTypeMap.cs" />
-    <Compile Include="Mapping\WFFrmMainMap.cs" />
+    <Compile Include="Mapping\FormMap.cs" />
    <Compile Include="Mapping\WFProcessInstanceMap.cs" />
    <Compile Include="Mapping\WFProcessOperationHistoryMap.cs" />
    <Compile Include="Mapping\WFProcessSchemeMap.cs" />
--- a/OpenAuth.Repository/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -38,7 +38,9 @@ namespace OpenAuth.Repository
        public System.Data.Entity.DbSet<Role> Roles { get; set; }
        public System.Data.Entity.DbSet<Stock> Stocks { get; set; }
        public System.Data.Entity.DbSet<User> Users { get; set; }
-        public System.Data.Entity.DbSet<WFFrmMain> WFFrmMains { get; set; }
+
+        public System.Data.Entity.DbSet<Form> Forms { get; set; }
+
        public System.Data.Entity.DbSet<WFProcessInstance> WFProcessInstances { get; set; }
        public System.Data.Entity.DbSet<WFProcessOperationHistory> WFProcessOperationHistories { get; set; }
        public System.Data.Entity.DbSet<WFProcessScheme> WFProcessSchemes { get; set; }
@@ -59,7 +61,7 @@ namespace OpenAuth.Repository
            modelBuilder.Configurations.Add(new RoleMap());
            modelBuilder.Configurations.Add(new StockMap());
            modelBuilder.Configurations.Add(new UserMap());
-            modelBuilder.Configurations.Add(new WFFrmMainMap());
+            modelBuilder.Configurations.Add(new FormMap());
            modelBuilder.Configurations.Add(new WFProcessInstanceMap());
            modelBuilder.Configurations.Add(new WFProcessOperationHistoryMap());
            modelBuilder.Configurations.Add(new WFProcessSchemeMap());