Merge branch 'v2020morge' into custom_script

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -19,9 +19,6 @@
         <member name="P:Performance.EntityModels.PerformanceDbContext.ag_fixatitem">
             <summary> 二次绩效固定项 </summary>
         </member>
-        <member name="P:Performance.EntityModels.PerformanceDbContext.ag_fixatitem_log">
-            <summary>  </summary>
-        </member>
         <member name="P:Performance.EntityModels.PerformanceDbContext.ag_header">
             <summary> 二次分配不固定列头数据 </summary>
         </member>
@@ -619,91 +616,6 @@
             1 value相加值为1
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem.CreateDate">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem.UpdateDate">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="T:Performance.EntityModels.ag_fixatitem_log">
-            <summary>
-            二次绩效固定项
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.ID">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.AllotId">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.SecondId">
-            <summary>
-            二次绩效ID
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.UnitType">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.RowNumber">
-            <summary>
-            行号
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.ItemName">
-            <summary>
-            项目名
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.ItemValue">
-            <summary>
-            值
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.FactorValue">
-            <summary>
-            系数
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.Sort">
-            <summary>
-            排序
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.Type">
-            <summary>
-            字段类型 1 顶部概况 2 表格固定 3 工作量
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.SourceType">
-            <summary>
-            1 自动带出 2 计算得出
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.SpecialAttr">
-            <summary>
-            1 value相加值为1
-            </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.DeleteDate">
-             <summary>
-            
-             </summary>
-        </member>
-        <member name="P:Performance.EntityModels.ag_fixatitem_log.DeleteUser">
-             <summary>
-            
-             </summary>
-        </member>
         <member name="T:Performance.EntityModels.ag_header">
             <summary>
             二次分配不固定列头数据

performance/Performance.EntityModels/Context/PerformanceDbContext.cs

@@ -26,9 +26,6 @@ public PerformanceDbContext(DbContextOptions<PerformanceDbContext> options)
         /// <summary> 二次绩效固定项 </summary>
         public virtual DbSet<ag_fixatitem> ag_fixatitem { get; set; }
 
-        /// <summary>  </summary>
-        public virtual DbSet<ag_fixatitem_log> ag_fixatitem_log { get; set; }
-
         /// <summary> 二次分配不固定列头数据 </summary>
         public virtual DbSet<ag_header> ag_header { get; set; }
 

performance/Performance.EntityModels/Entity/ag_fixatitem.cs

@@ -75,15 +75,5 @@ public class ag_fixatitem
         /// 1 value相加值为1
         /// </summary>
         public Nullable<int> SpecialAttr { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public Nullable<DateTime> UpdateDate { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/ag_fixatitem_log.cs

-//-----------------------------------------------------------------------
-// <copyright file=" ag_fixatitem_log.cs">
-// * FileName:
-// </copyright>
-//-----------------------------------------------------------------------
-using System;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace Performance.EntityModels
-{
-    /// <summary>
-    /// 二次绩效固定项
-    /// </summary>
-    [Table("ag_fixatitem_log")]
-    public class ag_fixatitem_log
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Key]
-        public int ID { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public Nullable<int> AllotId { get; set; }
-
-        /// <summary>
-        /// 二次绩效ID
-        /// </summary>
-        public Nullable<int> SecondId { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public string UnitType { get; set; }
-
-        /// <summary>
-        /// 行号
-        /// </summary>
-        public Nullable<int> RowNumber { get; set; }
-
-        /// <summary>
-        /// 项目名
-        /// </summary>
-        public string ItemName { get; set; }
-
-        /// <summary>
-        /// 值
-        /// </summary>
-        public string ItemValue { get; set; }
-
-        /// <summary>
-        /// 系数
-        /// </summary>
-        public Nullable<decimal> FactorValue { get; set; }
-
-        /// <summary>
-        /// 排序
-        /// </summary>
-        public Nullable<decimal> Sort { get; set; }
-
-        /// <summary>
-        /// 字段类型 1 顶部概况 2 表格固定 3 工作量
-        /// </summary>
-        public Nullable<int> Type { get; set; }
-
-        /// <summary>
-        /// 1 自动带出 2 计算得出
-        /// </summary>
-        public Nullable<int> SourceType { get; set; }
-
-        /// <summary>
-        /// 1 value相加值为1
-        /// </summary>
-        public Nullable<int> SpecialAttr { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public Nullable<DateTime> DeleteDate { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public Nullable<int> DeleteUser { get; set; }
-    }
-}

performance/Performance.Repository/Repository/PerforAgfixatitemlogRepository.cs

-//-----------------------------------------------------------------------
-// <copyright file=" ag_fixatitem_log.cs">
-// * FileName: ag_fixatitem_log.cs
-// </copyright>
-//-----------------------------------------------------------------------
-using System;
-using Performance.EntityModels;
-
-namespace Performance.Repository
-{
-    /// <summary>
-    /// ag_fixatitem_log Repository
-    /// </summary>
-    public partial class PerforAgfixatitemlogRepository : PerforRepository<ag_fixatitem_log>
-    {
-        public PerforAgfixatitemlogRepository(PerformanceDbContext context) : base(context)
-        {
-        }
-    }
-}