合并实例与实例模板

This commit is contained in:
yubaolee
2018-03-16 17:33:54 +08:00
parent 9c31ab6661
commit 67dd39dbc7
13 changed files with 1032 additions and 1523 deletions

View File

@@ -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>

View File

@@ -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; }
}
}

View File

@@ -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>

View File

@@ -55,9 +55,32 @@ namespace OpenAuth.Repository.Mapping
.HasColumnName("PreviousId")
.HasMaxLength(50)
.IsOptional();
Property(t => t.SchemeContent)
.HasColumnName("SchemeContent")
.IsOptional();
Property(t => t.SchemeId)
.HasColumnName("SchemeId")
.HasMaxLength(50)
.IsOptional();
Property(t => t.DbName)
.HasColumnName("DbName")
.HasMaxLength(50)
.IsOptional();
Property(t => t.FrmType)
.HasColumnName("FrmType")
.IsRequired();
Property(t => t.FrmContentData)
.HasColumnName("FrmContentData")
.HasMaxLength(16)
.IsOptional();
Property(t => t.FrmContentParse)
.HasColumnName("FrmContentParse")
.HasMaxLength(16)
.IsOptional();
Property(t => t.FrmId)
.HasColumnName("FrmId")
.HasMaxLength(50)
.IsOptional();
Property(t => t.SchemeType)
.HasColumnName("SchemeType")
.HasMaxLength(50)

View File

@@ -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.
// </autogenerated>
//------------------------------------------------------------------------------
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace OpenAuth.Repository.Mapping
{
public partial class FlowInstanceSchemeMap
: System.Data.Entity.ModelConfiguration.EntityTypeConfiguration<OpenAuth.Repository.Domain.FlowInstanceScheme>
{
public FlowInstanceSchemeMap()
{
// table
ToTable("FlowInstanceScheme", "dbo");
// keys
HasKey(t => t.Id);
// Properties
Property(t => t.Id)
.HasColumnName("Id")
.HasMaxLength(50)
.IsRequired();
Property(t => t.SchemeContent)
.HasColumnName("SchemeContent")
.IsOptional();
Property(t => t.SchemeId)
.HasColumnName("SchemeId")
.HasMaxLength(50)
.IsRequired();
Property(t => t.SchemeVersion)
.HasColumnName("SchemeVersion")
.HasMaxLength(50)
.IsOptional();
Property(t => t.CreateDate)
.HasColumnName("CreateDate")
.IsRequired();
Property(t => t.CreateUserId)
.HasColumnName("CreateUserId")
.HasMaxLength(50)
.IsOptional();
Property(t => t.CreateUserName)
.HasColumnName("CreateUserName")
.HasMaxLength(50)
.IsOptional();
// Relationships
}
}
}

View File

@@ -37,12 +37,15 @@ namespace OpenAuth.Repository.Mapping
.IsRequired();
Property(t => t.ContentData)
.HasColumnName("ContentData")
.HasMaxLength(16)
.IsOptional();
Property(t => t.ContentParse)
.HasColumnName("ContentParse")
.HasMaxLength(16)
.IsOptional();
Property(t => t.Content)
.HasColumnName("Content")
.HasMaxLength(16)
.IsOptional();
Property(t => t.SortCode)
.HasColumnName("SortCode")
@@ -50,8 +53,8 @@ namespace OpenAuth.Repository.Mapping
Property(t => t.Delete)
.HasColumnName("Delete")
.IsRequired();
Property(t => t.FrmDbId)
.HasColumnName("FrmDbId")
Property(t => t.DbName)
.HasColumnName("DbName")
.HasMaxLength(50)
.IsOptional();
Property(t => t.Enabled)

View File

@@ -62,7 +62,6 @@
<Compile Include="Core\Entity.cs" />
<Compile Include="Domain\FlowInstance.cs" />
<Compile Include="Domain\FlowInstanceOperationHistory.cs" />
<Compile Include="Domain\FlowInstanceScheme.cs" />
<Compile Include="Domain\FlowInstanceTransitionHistory.cs" />
<Compile Include="Domain\FlowScheme.cs" />
<Compile Include="Domain\Form.cs" />
@@ -81,7 +80,6 @@
<Compile Include="Mapping\CategoryTypeMap.cs" />
<Compile Include="Mapping\FlowInstanceMap.cs" />
<Compile Include="Mapping\FlowInstanceOperationHistoryMap.cs" />
<Compile Include="Mapping\FlowInstanceSchemeMap.cs" />
<Compile Include="Mapping\FlowInstanceTransitionHistoryMap.cs" />
<Compile Include="Mapping\FlowSchemeMap.cs" />
<Compile Include="Mapping\FormMap.cs" />

View File

@@ -43,7 +43,6 @@ namespace OpenAuth.Repository
public System.Data.Entity.DbSet<FlowInstance> FlowInstances { get; set; }
public System.Data.Entity.DbSet<FlowInstanceOperationHistory> FlowInstanceOperationHistories { get; set; }
public System.Data.Entity.DbSet<FlowInstanceScheme> FlowInstanceSchemes { get; set; }
public System.Data.Entity.DbSet<FlowInstanceTransitionHistory> FlowInstanceTransitionHistories { get; set; }
public System.Data.Entity.DbSet<FlowScheme> FlowSchemes { get; set; }
@@ -63,7 +62,6 @@ namespace OpenAuth.Repository
modelBuilder.Configurations.Add(new FormMap());
modelBuilder.Configurations.Add(new FlowInstanceMap());
modelBuilder.Configurations.Add(new FlowInstanceOperationHistoryMap());
modelBuilder.Configurations.Add(new FlowInstanceSchemeMap());
modelBuilder.Configurations.Add(new FlowInstanceTransitionHistoryMap());
modelBuilder.Configurations.Add(new FlowSchemeMap());