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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -64,6 +64,7 @@ using OASystem.Domain.Dtos.QiYeWeChat;
 using static NPOI.POIFS.Crypt.CryptoFunctions;
 using Aspose.Words.Lists;
 using OASystem.API.OAMethodLib.YouDaoAPI;
+using NPOI.XSSF.Streaming.Values;
 
 namespace OASystem.API.Controllers
 {
@@ -8368,13 +8369,33 @@ namespace OASystem.API.Controllers
                 }
 
                 GroupCostModulePromptView _view = new GroupCostModulePromptView();
-                ;
                 List<GroupCostModulePromptInfo> _ModulePromptInfos = new List<GroupCostModulePromptInfo>(); //机票存储多段
 
+                var currDatas = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0 && it.STid == 66).ToList();
+
+                string currCode = "";
+                #region currCode 验证
+
+                bool isInt = int.TryParse(_GroupCostParameters[0].Currency, out int intCurrency);
+                if (isInt)
+                {
+                    var currData = currDatas.Find(it => it.Id == intCurrency);
+                    if (currData != null)
+                    {
+                        currCode = currData.Name;
+                    }
+                }
+                else
+                {
+                    currCode = _GroupCostParameters[0].Currency.Trim();
+                }
+                #endregion
+
+
                 //op,酒店单段模式存储
                 GroupCostModulePromptInfo _ModulePromptInfo = new GroupCostModulePromptInfo()
                 {
-                    CurrencyCode = _GroupCostParameters[0].Currency,
+                    CurrencyCode = currCode,
                     Rate = _GroupCostParameters[0].Rate,
                     CostType = _GroupCostParameters[0].CostType,
                     CostTypeStartTime = Convert.ToDateTime(_GroupCostParameters[0].CostTypeStartTime).ToString("yyyy-MM-dd"),
@@ -8388,6 +8409,7 @@ namespace OASystem.API.Controllers
                     _ModulePromptInfo.CostTypeEndTime = Convert.ToDateTime(_GroupCostParameters[1].CostTypeendTime).ToString("yyyy-MM-dd");
                 }
 
+
                 foreach (var item in _GroupCostParameters)
                 {
                     decimal _rate = item.Rate;
@@ -8406,9 +8428,10 @@ namespace OASystem.API.Controllers
                     }
                     #endregion
 
+
                     GroupCostModulePromptInfo modulePromptInfo = new GroupCostModulePromptInfo()
                     {
-                        CurrencyCode = item.Currency,
+                        CurrencyCode = currCode,
                         Rate = _rate,
                         CostType = item.CostType,
                         CostTypeStartTime = Convert.ToDateTime(item.CostTypeStartTime).ToString("yyyy-MM-dd"),