提成部分修改 , 成本添加头等舱

OASystem/OASystem.Api/Controllers/FinancialController.cs

@@ -4811,7 +4811,7 @@ Group by PriceType ", dto.diId);
                     JoinType.Left, a.Id == x.DIId ,
                     JoinType.Left, b.CTable == 85 && b.CId == x.Id )
                 ).Where((x, a, b) => x.IsDel == 0 && x.CreateUserId == userId  && (b.IsAuditGM == 1 || b.IsAuditGM == 3)
-                    && a.IsDel == 0 && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime && b.IsDel == 0)
+                    && a.IsDel == 0 && a.VisitDate >= StartDateTime && a.VisitDate <= EndDateTime && b.IsDel == 0 && a.IsSure == 1 )
                     .Select((x, a, b) => new
                     {
                         x.FlightsDescription,
@@ -4929,7 +4929,7 @@ Group by PriceType ", dto.diId);
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName = groupinfo.TeamName,
-                        Id = groupinfo.Id,
+                        TeamId = groupinfo.Id,
                         chiArr = infos,
                         teamLvStr = teamLv.Find(x=>x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate = groupinfo.VisitDate,
@@ -5001,7 +5001,7 @@ Group by PriceType ", dto.diId);
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName = groupinfo.TeamName,
-                        Id =  groupinfo.Id,
+                        TeamId =  groupinfo.Id,
                         chiArr = infos,
                         teamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate =  groupinfo.VisitDate,
@@ -5030,7 +5030,7 @@ Group by PriceType ", dto.diId);
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName = groupinfo.TeamName,
-                        Id = groupinfo.Id,
+                        TeamId = groupinfo.Id,
                         chiArr = new List<string>() { temp },
                         teamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate = groupinfo.VisitDate,
@@ -5126,7 +5126,7 @@ Group by PriceType ", dto.diId);
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName = groupinfo.TeamName,
-                        Id =  groupinfo.Id,
+                        TeamId =  groupinfo.Id,
                         chiArr = infos,
                         teamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate = groupinfo.VisitDate,
@@ -5194,7 +5194,7 @@ Group by PriceType ", dto.diId);
                     resultArr.Add(new ComputeRoyaltiesView
                     {
                         TeamName =  groupinfo.TeamName,
-                        Id = groupinfo.Id,
+                        TeamId = groupinfo.Id,
                         chiArr = arr,
                         teamLvStr = teamLv.Find(x => x.Id == groupinfo.TeamLevSId)?.Name,
                         VisitDate =  groupinfo.VisitDate,
@@ -5330,17 +5330,25 @@ Group by PriceType ", dto.diId);
             var jw = JsonView(false);
             if (dto.ComputeRoyaltiesList.Count != 0)
             {
-                
+                //保存提成信息   
+                //消息通知对应人员(公司 部门 人员 时间段) 
 
 
             }
             else
             {
-                jw = JsonView(false,"保存失败!");
+                jw = JsonView(false,"保存失败! 无提成信息");
             }
 
             return Ok(jw);
         }
+
+        [HttpPost]
+        public IActionResult QueryRoyaltyInfo(QueryRoyaltyInfoDto dto)
+        {
+            var jw = JsonView(false);
+            return Ok(jw);
+        }
         #endregion
     }
 }

OASystem/OASystem.Domain/Dtos/Financial/ComputeRoyaltiesDto.cs

@@ -37,10 +37,19 @@ namespace OASystem.Domain.Dtos.Financial
         public DateTime EndDataTime { get; set; }
 
         /// <summary>
-        /// 提成人员
+        /// 提成人员Id
         /// </summary>
         public int UserId { get; set;}
 
+        /// <summary>
+        /// 部门Id
+        /// </summary>
+        public int DeparId { get; set;}
+
+        /// <summary>
+        /// 公司id
+        /// </summary>
+        public int CompanyId { get; set;}   
 
         /// <summary>
         /// 提成信息集合
@@ -48,11 +57,19 @@ namespace OASystem.Domain.Dtos.Financial
         public List<ComputeRoyaltiesView> ComputeRoyaltiesList {  get; set; }
     }
 
+    public class QueryRoyaltyInfoDto
+    {
+        /// <summary>
+        /// 提成人员Id
+        /// </summary>
+        public int UserId { get; set; }
+    }
+
     public class ComputeRoyaltiesView
     {
         public decimal price { get; set; }
         public string TeamName { get; set; }
-        public int Id { get; set; }
+        public int TeamId { get; set; }
         public List<string> chiArr { get; set; }
         public string? teamLvStr { get; set; }
         public DateTime VisitDate { get; set; }

OASystem/OASystem.Domain/Dtos/Groups/GroupCostSavaDto.cs

@@ -786,6 +786,22 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
 
         public int CostTypenumber { get; set; }
+
+        /// <summary>
+        /// 头等舱成本
+        /// </summary>
+
+        public decimal TDCCB { get; set; }
+        /// <summary>
+        /// 头等舱系数
+        /// </summary>
+
+        public decimal TDCXS { get; set; }
+        /// <summary>
+        /// 头等舱人数
+        /// </summary>
+
+        public int TDCRS { get; set; }
     }
 
     public class GroupCostInItDto

OASystem/OASystem.Domain/Entities/Groups/Grp_GroupCostParameter.cs

@@ -280,6 +280,22 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "int")]
         public int CostTypenumber { get; set; }
+
+        /// <summary>
+        /// 头等舱成本
+        /// </summary>
+
+        public decimal TDCCB { get; set; }
+        /// <summary>
+        /// 头等舱系数
+        /// </summary>
+
+        public decimal TDCXS { get; set; }
+        /// <summary>
+        /// 头等舱人数
+        /// </summary>
+
+        public int TDCRS { get; set; }
     }
 
     public class Grp_GroupCostParameterView: Grp_GroupCostParameter