1111

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -51,6 +51,7 @@ using Google.Protobuf.WellKnownTypes;
 using Microsoft.AspNetCore.SignalR;
 using OASystem.API.OAMethodLib.Hub.HubClients;
 using OASystem.API.OAMethodLib.Hub.Hubs;
+using System.Collections.Generic;
 
 namespace OASystem.API.Controllers
 {
@@ -1181,7 +1182,6 @@ namespace OASystem.API.Controllers
         /// </summary>
         /// <param name="paras">参数Json字符串</param>
         /// <returns></returns>
-
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostSearchGrpCreditCardPayment(Search_GrpCreditCardPaymentDto _dto)
@@ -1657,7 +1657,6 @@ namespace OASystem.API.Controllers
                         {
                             auditedFundsStr += string.Format(@"{0}{1}&nbsp;|", "0.00", item.CurrencyName);
                         }
-
                     }
                 }
 
@@ -1682,7 +1681,6 @@ namespace OASystem.API.Controllers
             }
         }
 
-
         /// <summary>
         /// 费用审核 
         /// 修改团组费用审核状态
@@ -3352,12 +3350,24 @@ namespace OASystem.API.Controllers
                 var excelTypeData = dataSource.Where(it => it.STid == 73).ToList(); //三公费用-Excel明细类型
                 List<SetDataInfoView> _ExcelTypeData = _mapper.Map<List<SetDataInfoView>>(excelTypeData);
 
+                //默认币种显示
+                List<CurrencyInfo> CurrencyInfos = new List<CurrencyInfo>()
+                { 
+                    new CurrencyInfo (){ CurrencyCode="USD",CurrencyName = "美元",Rate = 0.0000M },
+                    new CurrencyInfo (){ CurrencyCode="EUR",CurrencyName = "欧元",Rate = 0.0000M },
+                    new CurrencyInfo (){ CurrencyCode="GBP",CurrencyName = "英镑",Rate = 0.0000M },
+                    new CurrencyInfo (){ CurrencyCode="JPY",CurrencyName = "日元",Rate = 0.0000M },
+                    new CurrencyInfo (){ CurrencyCode="HKD",CurrencyName = "港币",Rate = 0.0000M },
+
+                };
+
                 return Ok(JsonView(true, "查询成功！", new
                 {
                     GroupNameData = groupNameData.Data,
                     CurrencyData = _CurrencyData,
                     WordTypeData = _WordTypeData,
-                    ExcelTypeData = _ExcelTypeData
+                    ExcelTypeData = _ExcelTypeData,
+                    CurrencyInit = CurrencyInfos
                     //NationalTravelFeeData = nationalTravelFeeData
                 }));
             }
@@ -3443,9 +3453,6 @@ namespace OASystem.API.Controllers
             }
         }
 
-
-
-
         /// <summary>
         /// 团组模块 - 出入境费用 - 子项删除
         /// </summary>

OASystem/OASystem.Api/appsettings.json

@@ -172,13 +172,13 @@
     {
       "CTableId": 98, //CtableId 其他款项
       "PageIdDatas": [ //页面Id
-
+        69
       ]
     },
     {
       "CTableId": 285, //CtableId 其他款项与收款退还
       "PageIdDatas": [ //页面Id
-        69
+        //69
       ]
     },
     {

OASystem/OASystem.Domain/ViewModels/Groups/EnterExitCostView.cs

@@ -1,4 +1,5 @@
 using OASystem.Domain.Entities.Groups;
+using OASystem.Domain.ViewModels.Financial;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlTypes;

OASystem/OASystem.Infrastructure/Repositories/Financial/PaymentRefundAndOtherMoneyRepository.cs

@@ -60,7 +60,7 @@ namespace OASystem.Infrastructure.Repositories.Financial
 				                         Left Join Sys_Users u1 On u1.Id = ccp.AuditGMOperate 
 				                         Where prom.IsDel = 0 And ccp.IsDel = 0 And prom.DiId = {0}", diId);
 
-            var data = await _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyItemView>(sql).ToListAsync();
+            var data = _sqlSugar.SqlQueryable<Fin_PaymentRefundAndOtherMoneyItemView>(sql).ToListAsync();
 
             _result.Data = data;
             _result.Code = 0;
@@ -134,24 +134,11 @@ namespace OASystem.Infrastructure.Repositories.Financial
         {
             if (dto.PortType == 1 || dto.PortType == 2 || dto.PortType == 3)  //1 Web 2 Android 3 Ios
             {
-                dynamic _currencyData = null, _payTypeData = null;
-                Result currencyData = await _setDataRep.GetSetDataBySTId(_setDataRep, 66); //币种类型
-                if (currencyData != null)
-                {
-                    if (currencyData.Code == 0)
-                    {
-                        _currencyData = currencyData.Data;
-                    }
-                }
 
-                Result payTypeData = await _setDataRep.GetSetDataBySTId(_setDataRep, 14); //支付类型
-                if (payTypeData != null)
-                {
-                    if (payTypeData.Code == 0)
-                    {
-                        _payTypeData = payTypeData.Data;
-                    }
-                }
+                var  setDatas = _sqlSugar.Queryable<Sys_SetData>().Where(it => it.IsDel == 0).ToList();
+                dynamic _currencyData = null, _payTypeData = null;
+                _currencyData = setDatas.Where(it => it.STid == 66).Select(it => new { it.Id, it.Name, it.Remark }); //币种类型
+                _payTypeData = setDatas.Where(it => it.STid == 14).Select(it => new { it.Id, it.Name, it.Remark }); //支付类型
 
                 List<dynamic> _priceTypeDatas = new List<dynamic>();
                 _priceTypeDatas.Add(new { Id = 0, Name = "其他", Remark = "" });