更新报价相关逻辑和方法名称

在 `GroupsController.cs` 中，重命名方法以更好地反映功能，并新增报价数据存在性验证逻辑。处理报价名称时，增加了对团组访问国家的处理。修改了 `info` 的处理逻辑，以确保返回的报价信息完整。

在 `DailyFeePaymentRepository.cs` 中，调整了审核状态的值。在 `EnterExitCostQuoteRepository.cs` 中，新增 `InfoByGroupIdAsync` 方法以根据 `GroupId` 获取报价详情，并确保返回的视图信息包含所有相关费用项信息。

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -13219,7 +13219,7 @@ FROM
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> EnterExitCostQuoteNameListDto(EnterExitCostQuoteNameListDto dto)
+        public async Task<IActionResult> EnterExitCostQuoteNameList(EnterExitCostQuoteNameListDto dto)
         {
             return Ok(await _enterExitCostQuoteRep.QuoteNameListAsync(dto));
         }
@@ -13230,7 +13230,7 @@ FROM
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> EnterExitCostQuoteGroupNameListDto(EnterExitCostQuoteGroupNameListDto dto)
+        public async Task<IActionResult> EnterExitCostQuoteGroupNameList(EnterExitCostQuoteGroupNameListDto dto)
         {
             return Ok(await _enterExitCostQuoteRep.GroupNameListAsync(dto));
         }
@@ -13248,8 +13248,54 @@ FROM
             if (groupId < 1) return Ok(JsonView(false, "请传入有效的GroupId;"));
             if (currUserId < 1) return Ok(JsonView(false, "请传入有效的CurrUserId;"));
 
+            //验证报价数据是否存在
+            var isNull = await _sqlSugar.Queryable<Grp_EnterExitCostQuote>().FirstAsync(x => x.IsDel == 0 && x.GroupId == dto.DiId);
+            if (isNull != null)
+            {
+                var info1 = await _enterExitCostQuoteRep.InfoAsync(new EnterExitCostQuoteInfoDto() { Id = isNull.Id });
+
+                if (!info1.Rates.Any())
+                {
+                    var rates = await GeneralMethod.EnterExitCostInitRate();
+                    info1.Rates = rates.ToArray();
+                }
+                return Ok(JsonView(info1));
+            }
+
+            var result = await _enterExitCostQuoteRep.InfoByGroupIdAsync(dto.DiId);
+
+            //处理报价名称
+            var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(x => x.Id == dto.DiId && x.IsDel == 0);
+            if (groupInfo != null)
+            {
+                var visitCountry = groupInfo.VisitCountry;
+                if (!string.IsNullOrEmpty(visitCountry))
+                {
+                    string quoteName = string.Empty;
+                    if (visitCountry.Contains("|"))
+                    {
+                        var countrys = visitCountry.Split("|");
+                        quoteName = string.Join("、", countrys);
+                    }
+                    else quoteName = visitCountry;
+
+                    quoteName += $"团组报价表";
+                    result.Name = quoteName;
+                }
+            }
+
+
             var info = await _enterExitCostRep.GetEnterExitCostInfoByDiId(dto);
-            if (info.Code != StatusCodes.Status200OK) return Ok(info);
+            if (info.Code != StatusCodes.Status200OK)
+            {
+                result.GroupId = groupId;
+                if (!result.Rates.Any())
+                {
+                    var rates = await GeneralMethod.EnterExitCostInitRate();
+                    result.Rates = rates.ToArray();
+                }
+                return Ok(JsonView(true, $"出入境费用明细未填写!", result));
+            }
 
             var infoView = info.Data as EnterExitCostInfoView;
             if (infoView == null) return Ok(JsonView(false, "数据类型转换失败!;"));
@@ -13259,7 +13305,7 @@ FROM
             var currencys = await _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && x.STid == 66).ToListAsync();
             var eecRates = infoView.Currencys;
              
-            var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().FirstAsync(x => x.Id == dto.DiId && x.IsDel == 0);
+            //处理团组人数
             int pplNum = 1;
             if (groupInfo != null) pplNum = groupInfo.VisitPNumber;
 
@@ -13546,9 +13592,6 @@ FROM
 
             #endregion
 
-            var result = await _enterExitCostQuoteRep.InfoAsync(new EnterExitCostQuoteInfoDto() { });
-
-            result.Rates = eecRates.ToArray();
             if (result.FeeItems.Any())
             {
                 result.FeeItems.Select(x =>
@@ -13557,11 +13600,22 @@ FROM
                             if (feeInfos.Any()) x.Infos = feeInfos;
                             return x;
                         }
-                    )
-                    .OrderBy(x => x.Index)
+                    ).OrderBy(x => x.Index)
                     .ToList();
+
+                if (!result.Rates.Any())
+                {
+                    if (eecRates.Any()) result.Rates = eecRates?.ToArray() ?? Array.Empty<CurrencyInfo>();
+                    else
+                    {
+                        var rates = await GeneralMethod.EnterExitCostInitRate();
+                        result.Rates = rates.ToArray();
+                    }
+                }
             }
 
+            result.Rates = eecRates.ToArray();
+
             return Ok(JsonView(result));
         }
 

OASystem/OASystem.Infrastructure/Repositories/Financial/DailyFeePaymentRepository.cs

@@ -423,7 +423,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
             var priceTypeInfo = await _sqlSugar.Queryable<Sys_SetData>().FirstAsync(x => x.IsDel == 0 && x.Id == dto.PriceTypeId);
             if (auditPer)
             {
-                _fee.MAudit = 1;
+                _fee.MAudit = 3;
                 _fee.MAuditDate = DateTime.Now;
             }
 

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostQuoteRepository.cs

@@ -166,8 +166,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
         /// <returns></returns>
         public async Task<EnterExitCostQuoteInfoView> InfoAsync(EnterExitCostQuoteInfoDto dto)
         {
+            int quoteId = dto.Id;
             var viewInfo = new EnterExitCostQuoteInfoView();
-            viewInfo.Id = dto.Id;
+            viewInfo.Id = quoteId;
             var basicItems = await InitBasicItemAsync(true);
 
             if (basicItems.Any())
@@ -176,10 +177,11 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
 
             var quoteInfo = await _sqlSugar.Queryable<Grp_EnterExitCostQuote>()
-                 .Where(x => x.IsDel == 0 && x.Id == x.Id)
+                 .Where(x => x.IsDel == 0 && x.Id == quoteId)
                  .FirstAsync();
             if (quoteInfo != null)
             {
+                viewInfo.Id = quoteInfo.Id;
                 viewInfo.Name = quoteInfo.Name;
                 viewInfo.GroupId = quoteInfo.GroupId;
                 viewInfo.Rates = CommonFun.GetCurrencyChinaToList(quoteInfo.CurrencyRemark).ToArray();
@@ -208,6 +210,58 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return viewInfo;
         }
 
+        /// <summary>
+        /// 获取报价详情 By GroupId
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <returns></returns>
+        public async Task<EnterExitCostQuoteInfoView> InfoByGroupIdAsync(int groupId)
+        {
+            var viewInfo = new EnterExitCostQuoteInfoView();
+
+            var basicItems = await InitBasicItemAsync(true);
+
+            if (basicItems.Any())
+            {
+                viewInfo.FeeItems = basicItems.Select(x => new QuoteItemInfo { ItemId = x.Id, ItemName = x.Name, Index = x.Index }).OrderBy(x => x.Index).ToArray();
+            }
+
+            var quoteInfo = await _sqlSugar.Queryable<Grp_EnterExitCostQuote>()
+                 .Where(x => x.IsDel == 0 && x.GroupId == groupId)
+                 .FirstAsync();
+            if (quoteInfo != null)
+            {
+                viewInfo.Id = quoteInfo.Id;
+                viewInfo.Name = quoteInfo.Name;
+                viewInfo.GroupId = quoteInfo.GroupId;
+                viewInfo.Rates = CommonFun.GetCurrencyChinaToList(quoteInfo.CurrencyRemark).ToArray();
+
+                var quoteItems = await _sqlSugar.Queryable<Grp_EnterExitCostQuoteItem>()
+                    .Where(x => x.IsDel == 0 && x.QuoteId == quoteInfo.Id)
+                    .Select(x => new QuoteSubItemInfo
+                    {
+                        Id = x.Id,
+                        ItemId = x.ItemId,
+                        FeeName = x.FeeName,
+                        UnitPrice = x.UnitPrice,
+                        Quantity = x.Quantity,
+                        PplNum = x.PplNum,
+                        Currency = x.Currency,
+                        TotalAmt = x.TotalAmt,
+                        Index = x.Index
+                    }).ToListAsync();
+
+                if (quoteItems.Any())
+                {
+                    viewInfo.FeeItems = viewInfo.FeeItems.Select(x => new QuoteItemInfo { Index = x.Index, QuoteId = quoteInfo.Id, ItemId = x.ItemId, ItemName = x.ItemName, Infos = quoteItems.Where(y => y.ItemId == x.ItemId).OrderBy(y => y.Index).ToArray() }).ToArray();
+                }
+            }
+
+            return viewInfo;
+        }
+
         /// <summary>
         /// Add Or Edit
         /// </summary>