添加成本获取历史车信息Api

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9022,6 +9022,51 @@ namespace OASystem.API.Controllers
             return Ok(jw);
         }
 
+        [HttpPost]
+        public async Task<IActionResult> GetHistoryCarData(HistoryCarDataDto dto)
+        {
+            var jw = JsonView(false);
+            List<HistoryCarDataView> view = new List<HistoryCarDataView>();
+            //获取现有所有车的数据
+            if (dto.Param.IsNullOrWhiteSpace())
+            {
+                if (dto.Param.Contains("、")) //
+                {
+
+                }
+                else
+                {
+                    view = await _sqlSugar.Queryable<Grp_CarTouristGuideGroundReservations, Grp_CarTouristGuideGroundReservationsContent, Sys_SetData, Grp_DelegationInfo>((c, cc, s, d) =>
+                        cc.CTGGRId == c.Id && cc.SId == s.Id && c.DiId == d.Id
+                         ).Where((c, cc, s) => s.Id == 91 && (c.Area.Contains(dto.Param) || c.PriceName.Contains(dto.Param)) 
+                         && cc.Price != 0 && (c.Area.IndexOf("尾款") == -1))
+                         .Select((c, cc, s, d) => new HistoryCarDataView
+                         {
+                             TeamName = d.TeamName,
+                             Area = c.Area,
+                             PriceName = c.PriceName,
+                             Price = cc.Price,
+                             Start = c.ServiceStartTime,
+                             End = c.ServiceEndTime
+                         }).ToListAsync();
+
+                    view = view.Where(x =>
+                    {
+                        var a = DateTime.TryParse(x.Start, out DateTime startTime);
+                        var b = DateTime.TryParse(x.End, out DateTime endTime);
+                        if (a && b)
+                        {
+                            x.Start = startTime.ToString("yyyy-MM-dd"); 
+                            x.End = endTime.ToString("yyyy-MM-dd");
+                        }
+                        return a && b; 
+                    }).ToList();
+                }
+            }
+
+            return Ok(jw);
+        }
+
         #endregion
 
         #region 酒店预定 保留

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

@@ -11,25 +11,25 @@ namespace OASystem.Domain.Dtos.Groups
     public class GroupCostSavaDto
     {
         //选中
-       public List<Grp_CheckBoxsDto> CheckBoxs { get; set; }
+        public List<Grp_CheckBoxsDto> CheckBoxs { get; set; }
 
         //列表
-       public List<Grp_GroupCostDto> GroupCosts { get; set; }
+        public List<Grp_GroupCostDto> GroupCosts { get; set; }
 
         //房间数
-       public List<Grp_CostTypeHotelNumberDto> CostTypeHotelNumbers { get; set; }
+        public List<Grp_CostTypeHotelNumberDto> CostTypeHotelNumbers { get; set; }
 
         //系数
-       public List<Grp_GroupCostParameterDto> GroupCostParameters { get; set; }
+        public List<Grp_GroupCostParameterDto> GroupCostParameters { get; set; }
 
         public int Userid { get; set; }
 
-        public int Diid {  get; set; }  
+        public int Diid { get; set; }
     }
 
     public class CarGuidesDto
     {
-     
+
     }
 
     public class GroupIsShareDto
@@ -104,7 +104,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 车费用
         /// </summary>
-        
+
         public decimal CarCost
         {
             get { return carCost; }
@@ -115,7 +115,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 车数量
         /// </summary>
-        
+
         public int CarNumber
         {
             get { return carNumber; }
@@ -126,7 +126,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 用车时间
         /// </summary>
-        
+
         public decimal CarTiming
         {
             get { return carTiming; }
@@ -137,7 +137,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  导游工资
         /// </summary>
-        
+
         public decimal TGS
         {
             get { return tgs; }
@@ -148,7 +148,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  导游工作时间
         /// </summary>
-        
+
         public decimal TGWH
         {
             get { return tgwh; }
@@ -159,7 +159,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  导游数量
         /// </summary>
-        
+
         public decimal TGN
         {
             get { return tgn; }
@@ -171,7 +171,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         decimal tgof;
 
-        
+
         public decimal TGOF
         {
             get { return tgof; }
@@ -182,7 +182,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 导游餐补
         /// </summary>
-        
+
         public decimal TGM
         {
             get { return tgm; }
@@ -193,7 +193,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 导游房补
         /// </summary>
-        
+
         public decimal TGA
         {
             get { return tga; }
@@ -204,7 +204,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 导游交通费
         /// </summary>
-        
+
         public decimal TGTF
         {
             get { return tgtf; }
@@ -215,7 +215,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 导游景点费
         /// </summary>
-        
+
         public decimal TGEF
         {
             get { return tgef; }
@@ -226,7 +226,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         ///  司机工资
         /// </summary>
-        
+
         public decimal CFS
         {
             get { return cfs; }
@@ -237,7 +237,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// 司机餐补
         /// </summary>
         decimal cfm;
-        
+
         public decimal CFM
         {
             get { return cfm; }
@@ -248,7 +248,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// 司机超时费用
         /// </summary>
         decimal cfof;
-        
+
         public decimal CFOF
         {
             get { return cfof; }
@@ -259,7 +259,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 早餐
         /// </summary>
-        
+
         public decimal B
         {
             get { return b; }
@@ -270,7 +270,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 午餐
         /// </summary>
-        
+
         public decimal L
         {
             get { return l; }
@@ -281,7 +281,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 晚餐
         /// </summary>
-        
+
         public decimal D
         {
             get { return d; }
@@ -292,7 +292,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 1/2 双人间
         /// </summary>
-        
+
         public decimal TBR
         {
             get { return tbr; }
@@ -302,7 +302,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 单间
         /// </summary>
-        
+
         public decimal SGR
         {
             get { return sgr; }
@@ -312,7 +312,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 小套房
         /// </summary>
-        
+
         public decimal JS_ES
         {
             get { return jses; }
@@ -323,7 +323,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 套房
         /// </summary>
-        
+
         public decimal Suite
         {
             get { return suite; }
@@ -344,7 +344,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 公务活动费用
         /// </summary>
-        
+
         public decimal TV
         {
             get { return tv; }
@@ -355,7 +355,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 邀请函相关费用
         /// </summary>
-        
+
         public decimal iL
         {
             get { return il; }
@@ -366,7 +366,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 公务翻译费用
         /// </summary>
-        
+
         public decimal IF
         {
             get { return iF; }
@@ -377,7 +377,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 景点门票
         /// </summary>
-        
+
         public decimal EF
         {
             get { return ef; }
@@ -388,7 +388,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 饮料零食水果
         /// </summary>
-        
+
         public decimal B_R_F
         {
             get { return brf; }
@@ -399,7 +399,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 出行物资
         /// </summary>
-        
+
         public decimal TE
         {
             get { return te; }
@@ -410,7 +410,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 导游小费
         /// </summary>
-        
+
         public decimal TGTips
         {
             get { return tgtips; }
@@ -420,7 +420,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 司机小费
         /// </summary>
-        
+
         public decimal DRVTips
         {
             get { return drvtips; }
@@ -431,7 +431,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 零用金
         /// </summary>
-        
+
         public decimal PC
         {
             get { return pc; }
@@ -442,7 +442,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 领队费
         /// </summary>
-        
+
         public decimal TLF
         {
             get { return tlf; }
@@ -453,7 +453,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 会务费
         /// </summary>
-        
+
         public decimal ECT
         {
             get { return ect; }
@@ -513,157 +513,157 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 团组ID
         /// </summary>
-        
+
         public int DiId { get; set; }
         /// <summary>
         /// 币种
         /// </summary>
-       
+
         public string Currency { get; set; }
         /// <summary>
         /// 汇率
         /// </summary>
-       
+
         public decimal Rate { get; set; }
         /// <summary>
         /// 税率
         /// </summary>
-       
+
         public decimal Tax { get; set; }
         /// <summary>
         /// 房费预算
         /// </summary>
-       
+
         public decimal FFYS { get; set; }
         /// <summary>
         /// 酒店系数
         /// </summary>
-       
+
         public decimal HotelXS { get; set; }
         /// <summary>
         /// 经济舱成本
         /// </summary>
-       
+
         public decimal JJCCB { get; set; }
         /// <summary>
         /// 经济舱系数
         /// </summary>
-       
+
         public decimal JJCXS { get; set; }
         /// <summary>
         /// 经济舱人数
         /// </summary>
-        
+
         public int JJCRS { get; set; }
         /// <summary>
         /// 公务舱成本
         /// </summary>
-       
+
         public decimal GWCCB { get; set; }
         /// <summary>
         /// 公务舱系数
         /// </summary>
-       
+
         public decimal GWCXS { get; set; }
         /// <summary>
         /// 公务舱人数
         /// </summary>
-        
+
         public int GWCRS { get; set; }
         /// <summary>
         /// 火车票成本
         /// </summary>
-       
+
         public decimal HCPCB { get; set; }
         /// <summary>
         /// 火车票系数
         /// </summary>
-       
+
         public decimal HCPXS { get; set; }
         /// <summary>
         /// 火车票人数
         /// </summary>
-        
+
         public int HCPRS { get; set; }
         /// <summary>
         /// 船票成本
         /// </summary>
-       
+
         public decimal CPCB { get; set; }
         /// <summary>
         /// 船票系数
         /// </summary>
-       
+
         public decimal CPXS { get; set; }
         /// <summary>
         /// 船票人数
         /// </summary>
-        
+
         public int CPRS { get; set; }
         /// <summary>
         /// 保险成本
         /// </summary>
-       
+
         public decimal BXCB { get; set; }
         /// <summary>
         /// 保险系数
         /// </summary>
-       
+
         public decimal BXXS { get; set; }
         /// <summary>
         /// 保险人数
         /// </summary>
-        
+
         public int BXRS { get; set; }
         /// <summary>
         /// 核酸检测成本
         /// </summary>
-       
+
         public decimal HSCB { get; set; }
         /// <summary>
         /// 核酸检测系数
         /// </summary>
-       
+
         public decimal HSXS { get; set; }
         /// <summary>
         /// 核酸检测人数
         /// </summary>
-        
+
         public int HSRS { get; set; }
         /// <summary>
         /// 签证成本
         /// </summary>
-       
+
         public decimal VisaCB { get; set; }
         /// <summary>
         /// 签证系数
         /// </summary>
-       
+
         public decimal VisaXS { get; set; }
         /// <summary>
         /// 签证人数
         /// </summary>
-        
+
         public int VisaRS { get; set; }
         /// <summary>
         /// 公务成本 : 公杂费
         /// </summary>
-       
+
         public decimal GWCB { get; set; }
         /// <summary>
         /// 公务系数: 公杂费
         /// </summary>
-       
+
         public decimal GWXS { get; set; }
         /// <summary>
         /// 公务人数 : 公杂费
         /// </summary>
-        
+
         public int GWRS { get; set; }
         /// <summary>
         /// 地接成本
         /// </summary>
-       
+
         public decimal DJCB { get; set; }
 
         /// <summary>
@@ -679,88 +679,88 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 单间 单人成本
         /// </summary>
-       
+
         public decimal SGRCB { get; set; }
         /// <summary>
         /// 单间数量(人数)
         /// </summary>
-        
+
         public int SGRNumber { get; set; }
         /// <summary>
         /// 单间 系数
         /// </summary>
-       
+
         public decimal SGRXS { get; set; }
         /// <summary>
         /// 1/2标间 单人成本
         /// </summary>
-       
+
         public decimal TBRCB { get; set; }
         /// <summary>
         /// 1/2标间数量(人数)
         /// </summary>
-        
+
         public int TBRNumber { get; set; }
         /// <summary>
         /// 1/2标间  系数
         /// </summary>
-       
+
         public decimal TBRXS { get; set; }
         /// <summary>
         /// 小套房/豪华套房 单人成本
         /// </summary>
-       
+
         public decimal JSESCB { get; set; }
         /// <summary>
         /// 小套房/豪华套房数量(人数)
         /// </summary>
-        
+
         public int JSESNumber { get; set; }
         /// <summary>
         /// 小套房/豪华套房 系数
         /// </summary>
-       
+
         public decimal JSESXS { get; set; }
         /// <summary>
         /// 套房  单人成本
         /// </summary>
-       
+
         public decimal SUITECB { get; set; }
         /// <summary>
         /// 套房数量(人数)
         /// </summary>
-        
+
         public int SUITENumber { get; set; }
         /// <summary>
         /// 套房  系数
         /// </summary>
-       
+
         public decimal SUITEXS { get; set; }
         /// <summary>
         /// 零用金成本
         /// </summary>
-       
+
         public decimal LYJCB { get; set; }
         /// <summary>
         /// 零用金系数
         /// </summary>
-       
+
         public decimal LYJXS { get; set; }
         /// <summary>
         /// 零用金人数
         /// </summary>
-        
+
         public int LYJRS { get; set; }
         /// <summary>
         /// 成本完成标识  0:未完成 1：完成
         /// </summary>
-        
+
         public int IsShare { get; set; }
 
         /// <summary>
         /// 分段类型
         /// </summary>
-       
+
         public string CostType { get; set; }
         /// <summary>
         /// 开始时间
@@ -773,13 +773,13 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 此段人数
         /// </summary>
-        
+
         public int CostTypenumber { get; set; }
     }
 
     public class GroupCostInItDto
     {
-        public int Diid { get; set; } 
+        public int Diid { get; set; }
     }
 
     public class GroupCostExportWordFile
@@ -834,7 +834,7 @@ namespace OASystem.Domain.Dtos.Groups
     {
         public string Type { get; set; }
 
-        public List<leftInfoModel> leftinfoNumber {get;set; }
+        public List<leftInfoModel> leftinfoNumber { get; set; }
     }
 
     public class RightModel
@@ -1302,7 +1302,7 @@ namespace OASystem.Domain.Dtos.Groups
 
         public string TeamName { get; set; }
 
-        public decimal Tax {  get; set; }
+        public decimal Tax { get; set; }
 
         public string Currency { get; set; }
 
@@ -1335,4 +1335,25 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public int CTable { get; set; }
     }
+
+    public class HistoryCarDataDto
+    {
+        public string Param { get; set; }
+    }
+
+    public class HistoryCarDataView
+    {
+        public string TeamName { get; set; }
+
+        public decimal Price { get; set; }
+
+        public string Area { get; set; }
+
+        public string PriceName { get; set; }
+
+        public string Start { get; set; }
+
+        public string End { get; set; }
+    }
+
 }