添加部分成本接口

OASystem/EntitySync/Program.cs

@@ -95,7 +95,7 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Fin_DailyFeePaymentContent),// 财务 - 日付申请详细类
     //typeof(Grp_GroupsTaskAssignment),
     //typeof(Grp_AirTicketReservations),
-    typeof(Grp_GroupCostParameter),
+    //typeof(Grp_GroupCostParameter),
     //typeof(Grp_TeamRate),              // 团组汇率
     //typeof(Fin_ForeignReceivables),    // 对外收款账单
     //typeof(Fin_ProceedsReceived),      // 已收款项
@@ -114,7 +114,11 @@ db.CodeFirst.SetStringDefaultLength(50).BackupTable().InitTables(new Type[]
     //typeof(Grp_GroupCost) //成本数据信息
     //typeof(Grp_CostTypeHotelNumber)//分段房间数量
     //typeof(Grp_VisaInfo)
-    typeof(Grp_CarTouristGuideGroundReservations),
-    typeof(Grp_CarTouristGuideGroundReservationsContent)
-});
+    //typeof(Grp_CarTouristGuideGroundReservations),
+    //typeof(Grp_CarTouristGuideGroundReservationsContent)
+    typeof(Grp_CarGuides),
+    typeof(Grp_GuidesInfo),
+    typeof(Grp_CarInfo),
+    typeof(Grp_ScenicSpotInfo),
+});;
 Console.WriteLine("数据库结构同步完成!");

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -3202,10 +3202,72 @@ namespace OASystem.API.Controllers
             return Ok(jw);
         }
 
+        /// <summary>
+        /// 司兼导数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetCarGuides(CarGuidesDto dto)
+        {
+            JsonView jw = null;
+            var Data = _sqlSugar.SqlQueryable<Grp_CarGuides>($@" select * from Grp_CarGuides where isdel = 0 ").ToList();
+            jw = JsonView(true, "获取成功！", Data);
+            return Ok(jw);
+        }
+
+
+        /// <summary>
+        /// 导游数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetGuidesInfo(CarGuidesDto dto)
+        {
+            JsonView jw = null;
+
+            //var Data = _sqlSugar.SqlQueryable<Grp_GuidesInfo>($@"		SELECT* FROM (
+            //                                      SELECT*,ROW_NUMBER() OVER (ORDER BY Id) AS RowNumber FROM Grp_GuidesInfo where (city like '%{dto.City}%' or country like '%{dto.City}%' )  and isdel = 0 ) as b
+            //                                      where RowNumber BETWEEN {(dto.Page - 1) * dto.Size + 1} and {(dto.Page) * dto.Size}").ToList();
+
+            var Data = _sqlSugar.SqlQueryable<Grp_GuidesInfo>($@" select * from Grp_GuidesInfo where isdel = 0 ").ToList();
+
+            jw = JsonView(true, "获取成功！", Data);
+            return Ok(jw);
+        }
+
+        /// <summary>
+        /// 成本车数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetCarInfo(CarGuidesDto dto)
+        {
+            JsonView jw = null;
+            var Data = _sqlSugar.SqlQueryable<Grp_CarInfo>($@" select * from Grp_CarInfo where isdel = 0 ").ToList();
+            jw = JsonView(true, "获取成功！", Data);
+            return Ok(jw);
+        }
+
+
+        /// <summary>
+        /// 景点数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult GetScenicSpotInfo(CarGuidesDto dto)
+        {
+            var Data = _sqlSugar.SqlQueryable<Grp_ScenicSpotInfo>($@" select * from Grp_ScenicSpotInfo where isdel = 0 ").ToList();
+            return Ok(JsonView(true, "获取成功！", Data));
+        }
+
         #endregion
 
-      
 
-       
+
+
     }
 }

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

@@ -27,6 +27,11 @@ namespace OASystem.Domain.Dtos.Groups
         public int Diid {  get; set; }  
     }
 
+    public class CarGuidesDto
+    {
+     
+    }
+
     public class Grp_CheckBoxsDto
     {
         public int Diid { get; set; }

OASystem/OASystem.Domain/Entities/Groups/Grp_CarGuides.cs

@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.Entities.Groups
+{
+    /// <summary>
+    /// 司兼导
+    /// </summary>
+    public class Grp_CarGuides:EntityBase
+    {
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+
+        /// <summary>
+        /// 服务类型
+        /// </summary>
+        public string ServiceType { get; set; }
+        /// <summary>
+        /// 车类型
+        /// </summary>
+        public string CarType { get; set; }
+        /// <summary>
+        /// 用车报价
+        /// </summary>
+        public string Offer { get; set; }
+        /// <summary>
+        /// 司兼导费用
+        /// </summary>
+        public string CGCost { get; set; }
+        /// <summary>
+        /// 用车时长
+        /// </summary>
+        public string RuningTime { get; set; }
+        /// <summary>
+        /// 车超时费用/时
+        /// </summary>
+        public string OvertimeFee { get; set; }
+        /// <summary>
+        /// 司兼导超时费/时
+        /// </summary>
+        public string CGOvertimeFee { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string Currency { get; set; }
+    }
+
+    /// <summary>
+    /// 导游
+    /// </summary>
+
+    public class Grp_GuidesInfo : EntityBase
+    {
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+        /// <summary>
+        /// 导游服务类型
+        /// </summary>
+        public string ServiceType { get; set; }
+        /// <summary>
+        /// 工作时间
+        /// </summary>
+        public string When { get; set; }
+        /// <summary>
+        /// 导游工资
+        /// </summary>
+        public string Price { get; set; }
+        /// <summary>
+        /// 翻译工资
+        /// </summary>
+        public string TranslationPrice { get; set; }
+
+        /// <summary>
+        /// 超时费用
+        /// </summary>
+        public string OvertimeFee { get; set; }
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string Currency { get; set; }
+    }
+
+
+    /// <summary>
+    /// 车数据
+    /// </summary>
+    public class Grp_CarInfo : EntityBase
+    {
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+        /// <summary>
+        /// 车类型
+        /// </summary>
+        public string CarType { get; set; }
+        /// <summary>
+        /// 服务类型
+        /// </summary>
+        public string ServiceType { get; set; }
+        /// <summary>
+        /// 用车时间
+        /// </summary>
+        public string When { get; set; }
+        /// <summary>
+        /// 价格
+        /// </summary>
+        public string Price { get; set; }
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string Currency { get; set; }
+        /// <summary>
+        /// 超时费用
+        /// </summary>
+        public string OvertimeFee { get; set; }
+    }
+
+
+    /// <summary>
+    /// 景点类
+    /// </summary>
+    public class Grp_ScenicSpotInfo : EntityBase
+    {
+        /// <summary>
+        /// 国家
+        /// </summary>
+        public string Country { get; set; }
+        /// <summary>
+        /// 城市
+        /// </summary>
+        public string City { get; set; }
+        /// <summary>
+        /// 景点
+        /// </summary>
+        public string ScenicSpot { get; set; }
+        /// <summary>
+        /// 景点项目描述
+        /// </summary>
+        public string ScenicSpotDetail { get; set; }
+        /// <summary>
+        /// 景点价格
+        /// </summary>
+        public float Price { get; set; }
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public string Currency { get; set; }
+        /// <summary>
+        /// 汇率
+        /// </summary>
+        public float Rate { get; set; }
+        /// <summary>
+        /// 景点地址
+        /// </summary>
+        public string Address { get; set; }
+    }
+
+}