|
@@ -597,21 +597,30 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
|
|
|
//车超时费
|
|
|
//餐费和三公经费那个表做完匹配后也放进超支表里
|
|
|
- //DataTable tb = new DataTable();
|
|
|
- //tb.Columns.Add("日期",typeof(DateTime));
|
|
|
- //tb.Columns.Add("费用", typeof(decimal));
|
|
|
- //var addsTourClientList = new List<Grp_TourClientList>();
|
|
|
- //var carExtraList = carTouristList.Where(x => x.SId == 982).ToList();
|
|
|
- //var mealPriceList = carTouristList.Where(x => x.SId == 93 || x.SId == 988 || x.SId == 989).GroupBy(x => x.DatePrice).ToList();
|
|
|
- //mealPriceList.ForEach(x =>
|
|
|
- //{
|
|
|
- // var row = tb.NewRow();
|
|
|
- // row["日期"] = x.Key;
|
|
|
- // row["费用"] = x.Sum(x => x.Price);
|
|
|
- //});
|
|
|
+ DataTable tb = new DataTable();
|
|
|
+ tb.Columns.Add("日期", typeof(DateTime));
|
|
|
+ tb.Columns.Add("费用", typeof(decimal));
|
|
|
+ var addsTourClientList = new List<Grp_TourClientList>();
|
|
|
+ var carExtraList = carTouristList.Where(x => x.SId == 982).ToList();
|
|
|
+ var mealPriceList = carTouristList.Where(x => x.SId == 93 || x.SId == 988 || x.SId == 989).GroupBy(x => x.DatePrice).ToList();
|
|
|
+ mealPriceList.ForEach(x =>
|
|
|
+ {
|
|
|
+ var row = tb.NewRow();
|
|
|
+ row["日期"] = x.Key;
|
|
|
+ row["费用"] = x.Sum(x => x.Price);
|
|
|
+ });
|
|
|
+ //限制只能选择地区
|
|
|
|
|
|
//三公费用
|
|
|
- //var cityPrice = carTouristList.Where(x=>)
|
|
|
+ var cityPrice = _sqlSugar.Queryable<Grp_NationalTravelFee>().Where(x =>
|
|
|
+ !string.IsNullOrEmpty(x.City) && x.City.Contains("")
|
|
|
+ ).ToList();
|
|
|
+
|
|
|
+ //超支费用表
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ //超支费用
|
|
|
|
|
|
|
|
|
foreach (var item in carTouristList)
|