财务 提成相关表

 Fin_ForeignReceivables 团组应收款项
 Fin_ProceedsReceived   团组已收款项
 Grp_CreditCardPayment  付款信息类
 Fin_OtherPrice         其他款项

OASystem/EntitySync/Program.cs

@@ -91,10 +91,13 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Res_CountryFeeCost)
     //typeof(Res_MemoInfo),
     //typeof(Fin_DailyFeePayment), // 财务 - 日付申请
-    //typeof(Fin_DailyFeePaymentContent)  // 财务 - 日付申请详细类
+    //typeof(Fin_DailyFeePaymentContent),  // 财务 - 日付申请详细类
-    //typeof(Grp_GroupsTaskAssignment)
+    //typeof(Grp_GroupsTaskAssignment),
-    //typeof(Grp_AirTicketReservations)
+    //typeof(Grp_AirTicketReservations),
-    //typeof(Grp_GroupCostParameter)
+    //typeof(Grp_GroupCostParameter),
-    typeof(Grp_TeamRate)
+    //typeof(Grp_TeamRate), // 团组汇率
+    //typeof(Fin_ForeignReceivables),  //对外收款账单
+    //typeof(Fin_ProceedsReceived),    //已收款项
+    //typeof( Fin_OtherPrice), //其他款项
 });
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.File;
 using OASystem.Domain;
 using OASystem.Domain.Dtos.Financial;
@@ -20,9 +21,9 @@ namespace OASystem.API.Controllers
     {
         private readonly IMapper _mapper;
         private readonly IConfiguration _config;
-        private readonly DailyFeePaymentRepository _daiRep;
         private readonly SqlSugarClient _sqlSugar;
         private readonly SetDataTypeRepository _setDataTypeRep;
+        private readonly DailyFeePaymentRepository _daiRep;    //日付申请仓库
 
         /// <summary>
         /// 初始化
@@ -81,6 +82,7 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(data));
         }
+        
         /// <summary>
         /// 日付申请 Single Search By Id
         /// </summary>
@@ -245,5 +247,21 @@ namespace OASystem.API.Controllers
             return Ok(JsonView(true));
         }
         #endregion
+
+        #region 团组提成
+        /// <summary>
+        /// 提成 Page Search
+        /// </summary>
+        /// <param name="dto"> 提成 分页 dto</param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostPageSearchCommissionList(PageDailyFeePaymentDto dto)
+        {
+            GroupCommission.GetCommissionPageList();
+
+            return Ok(JsonView(new object()));
+        }
+        #endregion
     }
 }

OASystem/OASystem.Api/OAMethodLib/GroupCommission.cs

@@ -0,0 +1,32 @@
+using OASystem.Infrastructure.Repositories.Groups;
+
+namespace OASystem.API.OAMethodLib
+{
+    /// <summary>
+    /// 团组提成
+    /// 雷怡 2023-08-14 16:04
+    /// </summary>
+    public static class GroupCommission
+    {
+        private readonly static DelegationInfoRepository _grpDelInfoRep = AutofacIocManager.Instance.GetService<DelegationInfoRepository>(); //团组信息
+
+        /// <summary>
+        /// 获取团组提成 Page List
+        /// </summary>
+        public static async void GetCommissionPageList()
+        {
+
+        }
+
+
+
+        /// <summary>
+        /// 获取团组提成
+        /// </summary>
+        /// <param name="DiId">团组Id</param>
+        public static async void GetCommission(int DiId)
+        { 
+            
+        }
+    }
+}

OASystem/OASystem.Api/OAMethodLib/GroupStepForDelegation.cs

@@ -473,5 +473,4 @@ Where d.Id={0} And u.Id not in({1})", DepartmentCode.IC, _groupConfig.FilterUser
 
     }
 
-
 }

OASystem/OASystem.Domain/Dtos/Financial/CommissionDto.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Dtos.Financial
+{
+    /// <summary>
+    /// 团组提成Dto
+    /// </summary>
+    public class CommissionDto
+    {
+    }
+
+    /// <summary>
+    /// 团组提成 分页 Dto
+    /// </summary>
+    public class CommissionPageDto:DtoBase
+    {
+        
+    }
+}

OASystem/OASystem.Domain/Entities/Financial/Fin_ForeignReceivables.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Financial
+{
+    /// <summary>
+    /// 财务 - 对外收款账单
+    /// 雷怡 2023-08-14 16:20
+    /// </summary>
+    [SugarTable("Fin_ForeignReceivables")]
+    public class Fin_ForeignReceivables:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true,ColumnDataType = "int")]
+        public int Diid { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
+        public string? PriceName { get; set; }
+
+        /// <summary>
+        /// 费用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Count { get; set; }
+
+        /// <summary>
+        /// 单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string? Unit { get; set; }
+
+        /// <summary>
+        /// 单项总和
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal ItemSumPrice { get; set; }
+
+        /// <summary>
+        /// 付款方
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string? To { get; set; }
+
+        /// <summary>
+        /// 付款方电话
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string? ToTel { get; set; }
+
+        /// <summary>
+        /// 付款日期
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string? PayDate { get; set; }
+
+        /// <summary>
+        /// 汇率
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,4)")]
+        public decimal Rate { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string? Currency { get; set; }
+
+        /// <summary>
+        /// 添加方式   
+        /// 0 - 账单页面添加   1 - 预算成本页面添加
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AddingWay { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Financial/Fin_OtherPrice.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Financial
+{
+    /// <summary>
+    /// 财务 - 其他款项
+    /// </summary>
+    [SugarTable("Fin_OtherPrice")]
+    public class Fin_OtherPrice:EntityBase
+    {
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        [SugarColumn(IsNullable = true,ColumnDataType = "int")]
+        public int Diid { get; set; }
+
+        /// <summary>
+        /// 费用名称
+        /// </summary>
+        [SugarColumn(IsNullable = true,ColumnDataType = "varchar(100)")]
+        public string? PriceName { get; set; }
+        
+        /// <summary>
+        /// 费用金额 
+        /// </summary>
+        [SugarColumn(IsNullable = true,ColumnDataType = "decimal(10,2)")]
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 币种Id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int CurrencyId { get; set; }
+
+        /// <summary>
+        /// 币种汇率
+        /// </summary>
+        [SugarColumn(IsNullable = true,ColumnDataType = "decimal(10,4)")]
+        public decimal DayRate { get; set; }
+
+        /// <summary>
+        /// 付款类型
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int PayType { get; set; }
+
+        /// <summary>
+        /// 退款标识
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int RefundType { get; set; }
+    }
+}

OASystem/OASystem.Domain/Entities/Financial/Fin_ProceedsReceived.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Financial
+{
+    /// <summary>
+    /// 财务 - 已收款项
+    /// 雷怡 2023-08-14 17:07
+    /// </summary>
+    public class Fin_ProceedsReceived:EntityBase
+    {
+        /// <summary>
+       /// 团组Id
+       /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int Diid { get; set; }
+
+        /// <summary>
+        /// 到款时间
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
+        public string? SectionTime { get; set; }
+
+        /// <summary>
+        /// 费用
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(18,2)")]
+        public decimal Price { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(20)")]
+        public string? Currency { get; set; }
+
+        /// <summary>
+        /// 收款类型
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int ReceivablesType { get; set; }
+
+        /// <summary>
+        /// 收款单位
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "varchar(200)")]
+        public string? Client { get; set; }
+
+        /// <summary>
+        /// 应付项id
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int FID { get; set; }
+    }
+}