Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -14654,13 +14654,18 @@ FROM
             var groupChecks = _checkBoxs.GetCheckBoxsByDiid(diid);  //团组选中信息  可枚举
             var groupCost = _GroupCostRepository.GetAllByDiid(diid);  //团组列表信息  
 
-            var create = _GroupCostRepository.
-                        CreateGroupCostByBlackCode(dto.Diid);
+            #region 屏蔽黑屏代码生成
+
+            //var create = _GroupCostRepository.
+            //            CreateGroupCostByBlackCode(dto.Diid);
+
+            //if (groupCost.Count == 0 && create.Code == 0)
+            //{
+            //    groupCost = (create.Data as List<Grp_GroupCost>) ?? new List<Grp_GroupCost>();
+            //}
+
+            #endregion
 
-            if (groupCost.Count == 0 && create.Code == 0)
-            {
-                groupCost = (create.Data as List<Grp_GroupCost>) ?? new List<Grp_GroupCost>();
-            }
 
             var groupCostMap = _mapper.Map<List<Grp_GroupCostDto>>(groupCost);
             var hotelNumber = _CostTypeHotelNumberRepository.GetCostTypeHotelNumberByDiid(diid); //酒店数量 可枚举
@@ -14678,7 +14683,7 @@ FROM
             //     Grp_GroupCostParameter());
             var GroupCostParameterMap = _mapper.Map<List<Grp_GroupCostParameterDto>>(GroupCostParameter);
 
-            bool hotelIsTrue = _sqlSugar.Queryable<Grp_HotelInquiry>().Where(x => x.DiId == dto.Diid && x.IsDel == 0).Count() > 0;
+            bool hotelIsTrue = _sqlSugar.Queryable<Grp_HotelInquiry>().Where(x => x.DiId == diid && x.IsDel == 0).Count() > 0;
 
             return Ok(JsonView(new
             {
@@ -14695,7 +14700,7 @@ FROM
                     x.Id,
                 }).ToList(),
                 baoPi = _GroupCostParameterRepository.GetBaoPi(diid),
-                blackCodeIsTrue = create.Code == 0 ? true : false,
+                blackCodeIsTrue = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(x=>x.IsDel == 0 && x.DiId == diid).Any() , //create.Code == 0 ? true : false,
                 hotelIsTrue = hotelIsTrue,
             }));
         }
@@ -16685,17 +16690,23 @@ FROM
         [HttpPost]
         public IActionResult CraeteGroupCostTravel(GroupCostInItDto dto)
         {
-            var jw = JsonView(false);
-            var Create = _GroupCostRepository.
-                CreateGroupCostByBlackCode(dto.Diid);
+            var jw = JsonView(false,"Error");
+            var Create = _sqlSugar.Queryable<Air_TicketBlackCode>()
+                                   .Where(x => x.IsDel == 0 && x.DiId == dto.Diid)
+                                   .Select(x=> new
+                                   {
+                                       x.Id,
+                                       x.Title
+                                   })
+                                   .ToList();
 
-            jw.Msg = Create.Msg;
-            if (Create.Code == 0)
+            if (Create.Any())
             {
+                jw.Msg = "获取成功！";
                 jw.Code = 200;
                 jw.Data = new
                 {
-                    groupCost = Create.Data,
+                    BlackCodeListSelect = Create,
                     blackCodeIsTrue = true
                 };
             }
@@ -16704,7 +16715,7 @@ FROM
                 jw.Code = 400;
                 jw.Data = new
                 {
-                    groupCost = Create.Data,
+                    BlackCodeListSelect = Create,
                     blackCodeIsTrue = false,
                 };
             }
@@ -16712,6 +16723,43 @@ FROM
             return Ok(jw);
         }
 
+
+        /// <summary>
+        /// 根据黑屏代码Id重新生成行程
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IActionResult CraeteGroupCostTravelById(CraeteGroupCostTravelByIdDto dto)
+        {
+            var jw = JsonView(false, "Error");
+            var result = _GroupCostRepository.CreateGroupCostByBlackCode(dto.DiId, dto.BlackCodeId);
+
+            if (result.Code == 0)
+            {
+
+                jw.Msg = "获取成功！";
+                jw.Code = 200;
+                jw.Data = new
+                {
+                    groupCost = result.Data,
+                    blackCodeIsTrue = true
+                };
+            }
+            else
+            {
+                jw.Code = 400;
+                jw.Data = new
+                {
+                    groupCost = result.Data,
+                    blackCodeIsTrue = false,
+                };
+            }
+
+            return Ok(jw);
+        }
+
+
         /// <summary>
         /// 成本获取OP历史车费用
         /// </summary>

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

@@ -809,6 +809,12 @@ namespace OASystem.Domain.Dtos.Groups
         public int Diid { get; set; }
     }
 
+    public class CraeteGroupCostTravelByIdDto 
+    {
+        public int DiId { get; set; }
+        public int BlackCodeId { get; set; }
+    }
+
     public class GroupCostExportWordFile
     {
         public int Diid { get; set; }

OASystem/OASystem.Domain/Dtos/Resource/TicketBlackCodeDto.cs

@@ -58,6 +58,18 @@ namespace OASystem.Domain.Dtos.Resource
         ///经济舱单价
         /// </summary>
         public decimal ECPrice { get; set; }
+
+        /// <summary>
+        /// 头等舱全价
+        /// </summary>
+
+        public decimal FCPrice { get; set; }
+
+        /// <summary>
+        /// 头等舱现价
+        /// </summary>
+        public decimal FCNowPrice { get; set; }
+
         /// <summary>
         /// 创建者Id
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/GroupCostRepository.cs

@@ -57,14 +57,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return  DeleteAsync(x => x.Diid == diid);
         }
 
-        public Result CreateGroupCostByBlackCode(int diid)
+        public Result CreateGroupCostByBlackCode(int diid,int blakcCodeId)
         {
             Result rt = new Result();
             List<Grp_GroupCost> returnArr = new List<Grp_GroupCost>();
             DataTable resultTable = null;
             try
             {
-                resultTable = GetTableByBlackCode(diid);
+                resultTable = GetTableByBlackCode(blakcCodeId);
                 if (resultTable.Rows.Count == 0 || string.IsNullOrWhiteSpace(resultTable.Rows[0][1].ToString()))
                 {
                     string msg = string.Empty;
@@ -156,11 +156,14 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// </summary>
         /// <param name="diid"></param>
         /// <returns></returns>
-        public DataTable GetTableByBlackCode(int diid)
+        public DataTable GetTableByBlackCode(int blackId)
         {
             string[] excludeArr = new string[] { "[中转]", "[转机]" };
             //黑屏代码信息
-            List<Air_TicketBlackCode> listcode = _sqlSugar.Queryable<Air_TicketBlackCode>().Where(x => x.DiId == diid && x.IsDel == 0).ToList();
+            List<Air_TicketBlackCode> listcode = new List<Air_TicketBlackCode>()
+            {
+                _sqlSugar.Queryable<Air_TicketBlackCode>().First(x => x.Id == blackId && x.IsDel == 0)
+            };
 
             //测试数据为序号,航班号,起飞日期,三字码,起飞时刻,到达时刻,出发航站楼,到达航站楼,机型,飞行时间
             //1.3U8391   TU17NOV CTUCAI  0220 0715   T1 T2  330  10H55M

OASystem/OASystem.Infrastructure/Repositories/Resource/TicketBlackCodeRepository.cs

@@ -39,38 +39,25 @@ namespace OASystem.Infrastructure.Repositories.Resource
             {
                 if (dto.Status == 1)//添加
                 {
-                    Air_TicketBlackCode _TicketBlackCode = await _sqlSugar.Queryable<Air_TicketBlackCode>().FirstAsync(a=>a.IsDel==0 && a.BlackCode==dto.BlackCode && a.DiId==dto.DiId);//查询是否存在
-                    if (_TicketBlackCode != null)
-                    {
-                        return result = new Result() { Code = -1, Msg = "该信息已存在，请勿重复添加！" };
-
-                    }
-                    else//不存在，可添加
-                    {
-
-                        Air_TicketBlackCode air_TicketBlack = _mapper.Map<Air_TicketBlackCode>(dto);
-                        int id = await _sqlSugar.Insertable(air_TicketBlack).ExecuteReturnIdentityAsync();
-                        if (id == 0)
-                        {
-                            return result = new Result() { Code = -1, Msg = "添加失败！" };
-
-                        }
-                        return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
-                    }
+                    Air_TicketBlackCode air_TicketBlack = _mapper.Map<Air_TicketBlackCode>(dto);
+                    int id = await _sqlSugar.Insertable(air_TicketBlack).ExecuteReturnIdentityAsync();
+                    return result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
                 }
                 else if (dto.Status == 2)//修改
                 {
                     bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Air_TicketBlackCode
                     {
-                        DiId=dto.DiId,
-                        BlackCode=dto.BlackCode,
-                        Price=dto.Price,
-                        NowPrice=dto.NowPrice,
-                        BCPrice=dto.BCPrice,
-                        ECPrice=dto.ECPrice,
+                        DiId = dto.DiId,
+                        BlackCode = dto.BlackCode,
+                        Price = dto.Price,
+                        NowPrice = dto.NowPrice,
+                        BCPrice = dto.BCPrice,
+                        ECPrice = dto.ECPrice,
                         CreateUserId = dto.CreateUserId,
                         Remark = dto.Remark,
                         Title = dto.Title,
+                        FCPrice = dto.FCPrice,
+                        FCNowPrice = dto.FCNowPrice
                     });
                     if (!res)
                     {
@@ -85,7 +72,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             catch (Exception ex)
             {
-                return result = new Result() { Code = -2, Msg = "程序错误！" };
+                return result = new Result() { Code = -2, Msg = $"程序错误！({ex.Message})" };
             }
         }