合并服务器

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -426,15 +426,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 Grp_AirTicketReservations grp_AirTicket = _mapper.Map<Grp_AirTicketReservations>(dto.AirTicketResOpData);
                 if (dto.Status == 1)
                 {
-                    string selectSql = string.Format(@"select * from Grp_AirTicketReservations where CONVERT(nvarchar,ClientName)= '{0}' and IsDel={1} and FlightsCode='{2}'"
-                                                     , dto.AirTicketResOpData.ClientName, 0,dto.AirTicketResOpData.FlightsCode);
-                    var DeleClient = await _sqlSugar.SqlQueryable<Grp_AirTicketReservations>(selectSql).FirstAsync();//查询是否存在
-                    if (DeleClient != null)
-                    {
-                        return result = new Result() { Code = -1, Msg = "该机票信息已存在，请勿重复添加！" };
-                    }
-                    else//不存在，可添加
-                    {
+                    //string selectSql = string.Format(@"select * from Grp_AirTicketReservations where CONVERT(nvarchar,ClientName)= '{0}' and IsDel={1} and FlightsCode='{2}'"
+                    //                                 , dto.AirTicketResOpData.ClientName, 0,dto.AirTicketResOpData.FlightsCode);
+                    //var DeleClient = await _sqlSugar.SqlQueryable<Grp_AirTicketReservations>(selectSql).FirstAsync();//查询是否存在
+                    //if (DeleClient != null)
+                    //{
+                    //    return result = new Result() { Code = -1, Msg = "该机票信息已存在，请勿重复添加！" };
+                    //}
+                    //else//不存在，可添加
+                    //{
                         //grp_AirTicket.ArrivedTime = "";
                         //grp_AirTicket.LeaveDescription = "";
                         //grp_AirTicket.FlightsDescription = "";
@@ -453,7 +453,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                             result = new Result() { Code = 0, Msg = "添加成功！" };
                         }
 
-                    }
+                   // }
                     if (result.Code == 0)
                     {
                         Grp_CreditCardPayment grp_CreditCard = _mapper.Map<Grp_CreditCardPayment>(dto.CardPaymentOpData);

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -746,6 +746,33 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     var mealPriceList = carTouristList.Where(x => (x.SId == 93 || x.SId == 988 || x.SId == 989) && x.Price != 0).GroupBy(x => x.DatePrice).ToList();
                     var tgOvertime = carTouristList.Where(x => x.SId == 1059 && x.Price != 0).ToList();
 
+                    //Dictionary<int,string> enterOverspendArrParam = new Dictionary<int,string>();
+                    //enterOverspendArrParam.Add(0,"");
+                    //enterOverspendArrParam.Add(1, "");
+                    //enterOverspendArrParam.Add(2, "");
+
+                    //List<List<Grp_CarTouristGuideGroundReservationsContent>> enterOverspendArr = new List<List<Grp_CarTouristGuideGroundReservationsContent>>();
+
+                    //foreach (var item in enterOverspendArrParam.Keys)
+                    //{
+                    //    var a = carTouristList.Where(x => x.SId == item).ToList();
+                    //    var b = a.Select(x => new Fin_GroupExtraCost
+                    //    {
+                    //         Coefficient = 1,
+                    //         CreateTime = DateTime.Now,
+                    //           CreateUserId = dto.CreateUserId,
+                    //            DiId = dto.DiId,
+                    //             FilePath = string.Empty,
+                    //              IsDel = 0,
+                    //              PriceCount = 0,
+                    //    }).ToList();
+                    //}
+
+
+
+
+
+
                     //成本数据
                     List<Grp_GroupCost> _GroupCosts = new List<Grp_GroupCost>();