修改返回体

OASystem/EntitySync/Program.cs

@@ -94,7 +94,7 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Fin_DailyFeePayment),       // 财务 - 日付申请
     //typeof(Fin_DailyFeePaymentContent),// 财务 - 日付申请详细类
     //typeof(Grp_GroupsTaskAssignment),
-    typeof(Grp_AirTicketReservations),
+    //typeof(Grp_AirTicketReservations),
     //typeof(Grp_GroupCostParameter),
     //typeof(Grp_TeamRate),              // 团组汇率
     //typeof(Fin_ForeignReceivables),    // 对外收款账单
@@ -110,5 +110,6 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Pm_WageSheet)       //人事模块 工资表单
     //typeof(Grp_VisaProgressCustomer),
     //typeof(Grp_VisaProgressCustomerPicture)
+    typeof(Grp_Ommission)
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Domain/Entities/Groups/Grp_Ommission.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+
+    /// <summary>
+    /// 提成表
+    /// </summary>
+    [SugarTable("Grp_Ommission")]
+    public class Grp_Ommission:EntityBase
+    {
+        /// <summary>
+        /// 员工ID
+        /// </summary>
+        [SugarColumn(IsNullable =true,ColumnDataType ="int")]
+        public int Personnel { get; set; }
+        /// <summary>
+        /// 团组ID
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Diid { get; set; }
+        /// <summary>
+        /// 团组结束时间，即团组最后一天
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public string GroupDate { get; set; }
+        /// <summary>
+        /// 团组级别
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public string GroupLvl { get; set; }
+        /// <summary>
+        /// 提成明细
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(300)")]
+        public string Detail { get; set; }
+        /// <summary>
+        /// 提成金额
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal Money { get; set; }
+        /// <summary>
+        /// 提成发放至工资的月份
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public string WageYearMonth { get; set; }
+        /// <summary>
+        /// 造成损失标识
+        /// 0=未造成
+        /// 1=造成
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsMakeLoss { get; set; }
+        /// <summary>
+        /// 亏损或无利润团组
+        /// 0=未亏损
+        /// 1=亏损
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int IsLoss { get; set; }
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -370,6 +370,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 else
                 {
                     ListViewBase<DelegationEasyView> rst = new ListViewBase<DelegationEasyView>();
+                    rst.DataList=new List<DelegationEasyView>();
                     return result = new Result() { Code = 0, Msg = "暂无数据！", Data = rst };
                 }
                 #endregion