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

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -320,7 +320,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> PostGroupPageList(GroupPageListDto dto)
         {
-             #region  参数验证
+            #region  参数验证
             if (dto.UserId < 1) return Ok(JsonView(false, "员工Id为空"));
             if (dto.PageId < 1) return Ok(JsonView(false, "页面Id为空"));
 
@@ -1499,7 +1499,7 @@ namespace OASystem.API.Controllers
                                         string nameContent = $@"{cityInfo.Country}-{cityInfo.City}";
 
                                         var carFeeItem = carFeeItems.Find(it => it.Id == touristGuideGroundReservations.PriceType);
-                                        if (carFeeItem != null )
+                                        if (carFeeItem != null)
                                         {
                                             nameContent += $@"({carFeeItem.Name})";
                                         }
@@ -1512,10 +1512,10 @@ namespace OASystem.API.Controllers
                                     _detail.PriceNameContent = touristGuideGroundReservations.Area;
                                 }
 
-                                
 
 
-                                
+
+
 
                                 List<Grp_CarTouristGuideGroundReservationsContent> touristGuideGroundReservationsContents = _CarTouristGuideGroundReservationsContent
                                     .Where(s => s.CTGGRId == touristGuideGroundReservations.Id && s.IsDel == 0 && s.Price != 0).ToList();
@@ -3682,11 +3682,12 @@ namespace OASystem.API.Controllers
                     if (rateInfo != null)
                     {
                         item.Rate = Convert.ToDecimal((Convert.ToDecimal(rateInfo.FSellPri == null ? 0.00M : rateInfo.FSellPri) / 100.00M).ToString("#0.0000"));
-                        reteInfos.Add(new { 
-                            currCode= item.CurrencyCode,
+                        reteInfos.Add(new
+                        {
+                            currCode = item.CurrencyCode,
                             currName = item.CurrencyName,
                             rate = item.Rate,
-                            lastUpdateDt = rateInfo.Date + " "+ rateInfo.Time
+                            lastUpdateDt = rateInfo.Date + " " + rateInfo.Time
                         });
                     }
                 }
@@ -4570,7 +4571,7 @@ namespace OASystem.API.Controllers
                         //}
 
                         List<string> countrys = _groupRepository.GroupSplitCountry(_DelegationInfo.VisitCountry);
-                        dic.Add("ReturnCode", string.Join( "、", countrys));
+                        dic.Add("ReturnCode", string.Join("、", countrys));
                         #endregion
 
 
@@ -4587,7 +4588,7 @@ namespace OASystem.API.Controllers
                         dic.Add("Day", _DelegationInfo.VisitDays.ToString());
 
                         dic.Add("CultivateDay", dac4.Count.ToString()); //培训天数
-                                                                     // dic.Add("VisitCountry", _DelegationInfo.VisitCountry);
+                                                                        // dic.Add("VisitCountry", _DelegationInfo.VisitCountry);
 
                         NodeCollection allTables = doc.GetChildNodes(NodeType.Table, true);
                         Aspose.Words.Tables.Table table1 = allTables[0] as Aspose.Words.Tables.Table;
@@ -4622,7 +4623,7 @@ namespace OASystem.API.Controllers
 
                         //删除多余行
                         //cultivateRowIndex -= 2;
-                        int delRows = 10 + 7  - cultivateRowIndex;
+                        int delRows = 10 + 7 - cultivateRowIndex;
                         if (delRows > 0)
                         {
                             for (int i = 0; i < delRows; i++)
@@ -4644,7 +4645,7 @@ namespace OASystem.API.Controllers
                         decimal cityTranfficFeeToatal = _EnterExitCosts.CityTranffic; //城市区间交通费
                         dic.Add("CityTranfficFeeToatal", cityTranfficFeeToatal.ToString("#0.00"));//
                         //其他费用
-                        decimal otherFeeTotal = _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket + _EnterExitCosts.YiMiao + _EnterExitCosts.HeSuan+ _EnterExitCosts.Service;
+                        decimal otherFeeTotal = _EnterExitCosts.Visa + _EnterExitCosts.Safe + _EnterExitCosts.Ticket + _EnterExitCosts.YiMiao + _EnterExitCosts.HeSuan + _EnterExitCosts.Service;
                         dic.Add("OtherFeeTotal", otherFeeTotal.ToString("#0.00"));
 
                         //其他费用合计
@@ -4652,7 +4653,7 @@ namespace OASystem.API.Controllers
 
                         decimal _jjcFeeToatal = _EnterExitCosts.AirJJ + _otherFeeTotal; //经济舱
                         decimal _gwcFeeToatal = _EnterExitCosts.AirGW + _otherFeeTotal; //公务舱
-                       
+
                         //公务舱合计
 
                         //国际旅费
@@ -11114,7 +11115,7 @@ namespace OASystem.API.Controllers
                 return Ok(JsonView(false, _view.Msg));
             }
 
-            return Ok(JsonView(true,"操作成功！", _view.Data));
+            return Ok(JsonView(true, "操作成功！", _view.Data));
         }
 
         /// <summary>
@@ -11145,9 +11146,95 @@ namespace OASystem.API.Controllers
         /// <returns></returns>
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> Test_SendMsg(PostTourClientListDownloadFile _dto)
+        public async Task<IActionResult> Test_DataChange(PostTourClientListDownloadFile _dto)
         {
-            DeleReminderMessage.PostMessageByWebhook();
+            _airTicketResRep.ChangeDataBase(DBEnum.OA2014DB);
+
+            string sql = string.Format(@" Select * From Visa With(Nolock) ");
+            List<OA2014_Visa> list_visa = _airTicketResRep._sqlSugar.SqlQueryable<OA2014_Visa>(sql).ToList();
+
+            _airTicketResRep.ChangeDataBase(DBEnum.OA2023DB);
+            Dictionary<string, int> dic_psg = new Dictionary<string, int>();
+            dic_psg.Add("客人", 974);
+            dic_psg.Add("司机", 975);
+            dic_psg.Add("导游", 976);
+            dic_psg.Add("公司内部人员", 977);
+            dic_psg.Add("司机/导游/公司内部人员", 978);
+
+            foreach (var item in list_visa)
+            {
+                Grp_VisaInfo temp = new Grp_VisaInfo();
+
+                temp.Id = item.Id;
+                temp.DIId = item.DIId;
+                temp.VisaClient = item.VisaClient;
+                temp.VisaPrice = Convert.ToDecimal(item.VisaPrice);
+                temp.VisaCurrency = item.VisaCurrency;
+
+                temp.IsThird = item.IsThird;
+                if (dic_psg.ContainsKey(item.PassengerType))
+                {
+                    temp.PassengerType = dic_psg[item.PassengerType];
+                }
+                else {
+                    temp.PassengerType = -1;
+                }
+                
+                temp.VisaNumber = item.VisaNumber;
+                temp.VisaFreeNumber = item.VisaFreeNumber;
+                temp.CreateUserId = item.Operators;
+
+                DateTime dt_ct;
+                bool b_ct = DateTime.TryParse(item.OperatorsDate, out dt_ct);
+                if (b_ct)
+                {
+                    temp.CreateTime = dt_ct;
+                }
+                else
+                {
+                    temp.CreateTime = DateTime.Now;
+                }
+
+                temp.DeleteTime = "";
+                temp.DeleteUserId = 0;
+                temp.Remark = item.Remark;
+                if (string.IsNullOrEmpty(temp.Remark)) {
+                    temp.Remark = "";
+                }
+
+                temp.IsDel = item.IsDel;
+                temp.VisaDescription = item.VisaAttachment;
+
+                string sqlInsert = string.Format(@" INSERT INTO [dbo].[Grp_VisaInfo]
+           
+([Id]
+           ,[DIId]
+           ,[VisaClient]
+           ,[VisaPrice]
+           ,[VisaCurrency]
+
+           ,[IsThird]
+           ,[PassengerType]
+           ,[VisaNumber]
+           ,[VisaFreeNumber]
+           ,[CreateUserId]
+
+           ,[CreateTime]
+           ,[DeleteTime]
+           ,[DeleteUserId]
+           ,[Remark]
+           ,[IsDel]
+           ,[visaDescription])
+     VALUES
+           ({0},{1},'{2}',{3},{4}
+,{5},{6},{7},{8},{9}
+,'{10}','{11}',{12},'{13}',{14},'{15}') ",temp.Id,temp.DIId,temp.VisaClient,temp.VisaPrice,temp.VisaCurrency,
+temp.IsThird,temp.PassengerType,temp.VisaNumber,temp.VisaNumber,temp.CreateUserId,
+temp.CreateTime, temp.DeleteTime, temp.DeleteUserId, temp.Remark,temp.IsDel,temp.VisaDescription
+);
+               await _airTicketResRep.ExecuteCommandAsync(sqlInsert);
+            }
+
 
             return Ok(JsonView(true, "操作成功！"));
         }

OASystem/OASystem.Domain/Dtos/Groups/VisaPriceDto.cs

@@ -19,7 +19,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// 客户名称
         /// </summary>
         public String VisaClient { get; set; }
-        public int IsPaySign { get; set; }
+        public int IsPaySign { get; set; } = -1;
     }
     public class PostVisaByIdDto 
     {

OASystem/OASystem.Domain/ViewModels/Groups/VisaInfoView.cs

@@ -40,6 +40,7 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 币种
         /// </summary>
         public string VisaCurrencyStr { get; set; }
+        public int VisaCurrency { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

OASystem/OASystem.Domain/ViewModels/OA2014DB.cs

@@ -0,0 +1,605 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels
+{
+    public class OA2014DB
+    {
+    }
+
+    public class OA2014_Visa
+    {
+        int id;
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        int dIId;
+
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DIId
+        {
+            get { return dIId; }
+            set { dIId = value; }
+        }
+
+        string visaClient;
+
+        /// <summary>
+        /// 签证客户
+        /// </summary>
+        public string VisaClient
+        {
+            get { return visaClient; }
+            set { visaClient = value; }
+        }
+
+        float visaPrice;
+
+        /// <summary>
+        /// 签证费用
+        /// </summary>
+        public float VisaPrice
+        {
+            get { return visaPrice; }
+            set { visaPrice = value; }
+        }
+
+        int visaCurrency;
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public int VisaCurrency
+        {
+            get { return visaCurrency; }
+            set { visaCurrency = value; }
+        }
+
+        /// <summary>
+        /// 是否第三方支付
+        /// </summary>
+        public int IsThird { get; set; }
+
+        string visaAttachment;
+
+        /// <summary>
+        /// 签证附件
+        /// </summary>
+        public string VisaAttachment
+        {
+            get { return visaAttachment; }
+            set { visaAttachment = value; }
+        }
+
+        string remark;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get { return remark; }
+            set { remark = value; }
+        }
+
+        int operators;
+
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public int Operators
+        {
+            get { return operators; }
+            set { operators = value; }
+        }
+
+        string operatorsDate;
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public string OperatorsDate
+        {
+            get { return operatorsDate; }
+            set { operatorsDate = value; }
+        }
+
+        int isDel;
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int IsDel
+        {
+            get { return isDel; }
+            set { isDel = value; }
+        }
+
+        public string IsAuditGM { get; set; }
+        /// <summary>
+        /// 签字人员类型
+        /// </summary>
+        public string PassengerType { get; set; }
+        /// <summary>
+        /// 办理签证人数
+        /// </summary>
+        public int VisaNumber { get; set; }
+        /// <summary>
+        /// 免签人数
+        /// </summary>
+        public int VisaFreeNumber { get; set; }
+    }
+
+    public class OA2014_CreditCardPayment
+    {
+        int id;
+
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id
+        {
+            get { return id; }
+            set { id = value; }
+        }
+
+        int payDId;
+
+        /// <summary>
+        /// 支付方式（设置数据外键编号）
+        /// </summary>
+        public int PayDId
+        {
+            get { return payDId; }
+            set { payDId = value; }
+        }
+
+        string consumptionPatterns;
+
+        /// <summary>
+        /// 消费方式
+        /// </summary>
+        public string ConsumptionPatterns
+        {
+            get { return consumptionPatterns; }
+            set { consumptionPatterns = value; }
+        }
+
+        string consumptionDate;
+
+        /// <summary>
+        /// 消费日期
+        /// </summary>
+        public string ConsumptionDate
+        {
+            get { return consumptionDate; }
+            set { consumptionDate = value; }
+        }
+
+        int cTDId;
+
+        /// <summary>
+        /// 卡类型
+        /// </summary>
+        public int CTDId
+        {
+            get { return cTDId; }
+            set { cTDId = value; }
+        }
+
+        string bankNo;
+
+        /// <summary>
+        /// 银行卡号
+        /// </summary>
+        public string BankNo
+        {
+            get { return bankNo; }
+            set { bankNo = value; }
+        }
+
+        string cardholderName;
+
+        /// <summary>
+        /// 持卡人姓名
+        /// </summary>
+        public string CardholderName
+        {
+            get { return cardholderName; }
+            set { cardholderName = value; }
+        }
+
+        float payMoney;
+
+        /// <summary>
+        /// 付款金额
+        /// </summary>
+        public float PayMoney
+        {
+            get { return payMoney; }
+            set { payMoney = value; }
+        }
+
+        int paymentCurrency;
+
+        /// <summary>
+        /// 付款币种
+        /// </summary>
+        public int PaymentCurrency
+        {
+            get { return paymentCurrency; }
+            set { paymentCurrency = value; }
+        }
+
+        string dayRate;
+
+        /// <summary>
+        /// 当天汇率
+        /// </summary>
+        public string DayRate
+        {
+            get { return dayRate; }
+            set { dayRate = value; }
+        }
+
+        string companyBankNo;
+
+        /// <summary>
+        /// 公司银行卡号
+        /// </summary>
+        public string CompanyBankNo
+        {
+            get { return companyBankNo; }
+            set { companyBankNo = value; }
+        }
+
+        string otherBankName;
+
+        /// <summary>
+        /// 对方开户行
+        /// </summary>
+        public string OtherBankName
+        {
+            get { return otherBankName; }
+            set { otherBankName = value; }
+        }
+
+        string otherSideNo;
+
+        /// <summary>
+        /// 对方银行账号
+        /// </summary>
+        public string OtherSideNo
+        {
+            get { return otherSideNo; }
+            set { otherSideNo = value; }
+        }
+
+        string otherSideName;
+
+        /// <summary>
+        /// 对方姓名
+        /// </summary>
+        public string OtherSideName
+        {
+            get { return otherSideName; }
+            set { otherSideName = value; }
+        }
+
+        string remark;
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark
+        {
+            get { return remark; }
+            set { remark = value; }
+        }
+
+        int operators;
+
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public int Operators
+        {
+            get { return operators; }
+            set { operators = value; }
+        }
+
+        string operatorsDate;
+
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public string OperatorsDate
+        {
+            get { return operatorsDate; }
+            set { operatorsDate = value; }
+        }
+
+        int mFOperators;
+
+        /// <summary>
+        /// 财务操作人
+        /// </summary>
+        public int MFOperators
+        {
+            get { return mFOperators; }
+            set { mFOperators = value; }
+        }
+
+        string mFOperatorsDate;
+
+        /// <summary>
+        /// 财务操作时间
+        /// </summary>
+        public string MFOperatorsDate
+        {
+            get { return mFOperatorsDate; }
+            set { mFOperatorsDate = value; }
+        }
+
+        int isAuditDM;
+
+        /// <summary>
+        /// 部门经理是否审核
+        /// </summary>
+        public int IsAuditDM
+        {
+            get { return isAuditDM; }
+            set { isAuditDM = value; }
+        }
+
+        int auditDMOperate;
+
+        /// <summary>
+        /// 部门经理审核人
+        /// </summary>
+        public int AuditDMOperate
+        {
+            get { return auditDMOperate; }
+            set { auditDMOperate = value; }
+        }
+
+        string auditDMDate;
+
+        /// <summary>
+        /// 部门经理审核时间
+        /// </summary>
+        public string AuditDMDate
+        {
+            get { return auditDMDate; }
+            set { auditDMDate = value; }
+        }
+
+        int isAuditMF;
+
+        /// <summary>
+        /// 财务部是否审核
+        /// </summary>
+        public int IsAuditMF
+        {
+            get { return isAuditMF; }
+            set { isAuditMF = value; }
+        }
+
+        int auditMFOperate;
+
+        /// <summary>
+        /// 财务部审核人
+        /// </summary>
+        public int AuditMFOperate
+        {
+            get { return auditMFOperate; }
+            set { auditMFOperate = value; }
+        }
+
+        string auditMFDate;
+
+        /// <summary>
+        /// 财务部审核时间
+        /// </summary>
+        public string AuditMFDate
+        {
+            get { return auditMFDate; }
+            set { auditMFDate = value; }
+        }
+
+        int isAuditGM;
+
+        /// <summary>
+        /// 总经理是否审核
+        /// </summary>
+        public int IsAuditGM
+        {
+            get { return isAuditGM; }
+            set { isAuditGM = value; }
+        }
+
+        int auditGMOperate;
+
+        /// <summary>
+        /// 总经理审核人
+        /// </summary>
+        public int AuditGMOperate
+        {
+            get { return auditGMOperate; }
+            set { auditGMOperate = value; }
+        }
+
+        string auditGMDate;
+
+        /// <summary>
+        /// 总经理审核时间
+        /// </summary>
+        public string AuditGMDate
+        {
+            get { return auditGMDate; }
+            set { auditGMDate = value; }
+        }
+
+        int isPay;
+
+        /// <summary>
+        /// 是否付款
+        /// </summary>
+        public int IsPay
+        {
+            get { return isPay; }
+            set { isPay = value; }
+        }
+
+        int dIId;
+
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DIId
+        {
+            get { return dIId; }
+            set { dIId = value; }
+        }
+
+        int cId;
+
+        /// <summary>
+        /// 指向表外键编号
+        /// </summary>
+        public int CId
+        {
+            get { return cId; }
+            set { cId = value; }
+        }
+
+        int cTable;
+
+        /// <summary>
+        /// 指向标识（设置数据外键编号）
+        /// </summary>
+        public int CTable
+        {
+            get { return cTable; }
+            set { cTable = value; }
+        }
+
+        int isDel;
+
+        /// <summary>
+        /// 删除标识
+        /// </summary>
+        public int IsDel
+        {
+            get { return isDel; }
+            set { isDel = value; }
+        }
+
+        string payPercentage;
+
+        /// <summary>
+        /// 此次付款百分比
+        /// </summary>
+        public string PayPercentage
+        {
+            get { return payPercentage; }
+            set { payPercentage = value; }
+        }
+
+        string payThenMoney;
+
+        /// <summary>
+        /// 此次付款金额
+        /// </summary>
+        public string PayThenMoney
+        {
+            get { return payThenMoney; }
+            set { payThenMoney = value; }
+        }
+
+        string payPercentageOld;
+        /// <summary>
+        /// 上次付款百分比
+        /// </summary>
+        public string PayPercentageOld
+        {
+            get { return payPercentageOld; }
+            set { payPercentageOld = value; }
+        }
+        string payThenMoneyOld;
+        /// <summary>
+        /// 上次付款金额
+        /// </summary>
+        public string PayThenMoneyOld
+        {
+            get { return payThenMoneyOld; }
+            set { payThenMoneyOld = value; }
+        }
+        string updateDate;
+
+        /// <summary>
+        /// 上次付款时间
+        /// </summary>
+        public string UpdateDate
+        {
+            get { return updateDate; }
+            set { updateDate = value; }
+        }
+
+        string payee;
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        public string Payee
+        {
+            get { return payee; }
+            set { payee = value; }
+        }
+
+        float rMBPrice;
+
+        /// <summary>
+        /// 人民币费用
+        /// </summary>
+        public float RMBPrice
+        {
+            get { return rMBPrice; }
+            set { rMBPrice = value; }
+        }
+
+
+
+        string orbitalPrivateTransfer;
+        /// <summary>
+        /// 费用标识
+        /// </summary>
+        public string OrbitalPrivateTransfer
+        {
+            get { return orbitalPrivateTransfer; }
+            set { orbitalPrivateTransfer = value; }
+        }
+
+        /// <summary>
+        /// 超出预算比例
+        /// </summary>
+        public float ExceedBudget { get; set; }
+
+        /// <summary>
+        /// 是否匹配上了信用卡账单
+        /// </summary>
+        public int IsMatchCreditCard { get; set; }
+
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaPriceRepository.cs

@@ -26,12 +26,12 @@ namespace OASystem.Infrastructure.Repositories.Groups
     {
         private readonly IMapper _mapper;
 
-        public VisaPriceRepository(SqlSugarClient sqlSugar,IMapper mapper)
+        public VisaPriceRepository(SqlSugarClient sqlSugar, IMapper mapper)
             : base(sqlSugar)
         {
-            _mapper=mapper;
+            _mapper = mapper;
         }
-        
+
 
         /// <summary>
         /// 根据diid查询签证费用列表
@@ -41,9 +41,9 @@ namespace OASystem.Infrastructure.Repositories.Groups
         public async Task<Result> PostVisaByDiId(VisaPriceDto dto)
         {
             Result result = new Result() { Code = -2, Msg = "未知错误" };
-            if (dto.PortType==0 ||string.IsNullOrWhiteSpace(dto.PortType.ToString()))
+            if (dto.PortType == 0 || string.IsNullOrWhiteSpace(dto.PortType.ToString()))
             {
-               return result = new Result() { Code = -1, Msg = "请传入PortType参数，请求端口分类 1 Web 2 Android 3 IOS" };
+                return result = new Result() { Code = -1, Msg = "请传入PortType参数，请求端口分类 1 Web 2 Android 3 IOS" };
             }
             try
             {
@@ -54,7 +54,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     sqlWhere += string.Format(@" And v.VisaClient like '%{0}%'", dto.VisaClient);
                 }
-                
+
                 sqlWhere += string.Format(@"And v.DIId={0} and v.isdel={1}", dto.DiID, 0);
                 string UserId = "";
                 List<Grp_GroupsTaskAssignment> gtaUIdList = _sqlSugar.Queryable<Grp_GroupsTaskAssignment>().Where(a => a.DIId == dto.DiID && a.IsDel == 0 && a.CTId == 80).ToList();
@@ -85,16 +85,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 #endregion
                 int startIndex = (dto.PageIndex - 1) * dto.PageSize + 1;
                 int endIndex = startIndex + dto.PageSize - 1;
-                if (dto.PortType==1)
+                if (dto.PortType == 1)
                 {
                     //string sql = string.Format(@"select *,(select IsAuditGM from Grp_CreditCardPayment where CTable=80 and CId=v.Id and IsDel=0) IsAuditGM,
                     //                            (select Name from Sys_SetData where isdel=0 and v.VisaCurrency=Id) VisaCurrencyStr from
                     //                            Grp_VisaInfo v {0} order by CreateTime desc",sqlWhere);
 
-                    string sql = string.Format(@" Select v.*, c.IsAuditGM,c.IsPay,sd1.[Name] as VisaCurrencyStr
-From Grp_VisaInfo as v With(Nolock) Left Join Grp_CreditCardPayment as c With(Nolock) On v.Id = c.CId
-Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
-{0} And c.CTable = 80 And c.IsDel = 0 And sd1.IsDel = 0  ", sqlWhere);
+                    string sql = string.Format(@"  Select v.*, c.IsAuditGM,c.IsPay
+From Grp_VisaInfo as v With(Nolock) left Join Grp_CreditCardPayment as c With(Nolock) On v.Id = c.CId
+{0}
+ And c.CTable = 80 And c.IsDel = 0   ", sqlWhere);
 
                     List<VisaInfoView> infoViews = _sqlSugar.SqlQueryable<VisaInfoView>(sql).ToList();
                     var parseIntValue = 0;
@@ -108,8 +108,32 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                         sql = string.Format("SELECT * FROM Crm_DeleClient cdc where id in ({0}) and IsDel  = 0", strCrmIds);
                         clietArr = _sqlSugar.SqlQueryable<Crm_DeleClient>(sql).ToList();
                     }
+
+                    Dictionary<int, string> dic_Currency = new Dictionary<int, string>();
+
                     foreach (VisaInfoView view in infoViews)
                     {
+                        if (dic_Currency.ContainsKey(view.VisaCurrency))
+                        {
+                            view.VisaCurrencyStr = dic_Currency[view.VisaCurrency];
+                        }
+                        else
+                        {
+                            List<Sys_SetData> temp_sdList = Query<Sys_SetData>(s => s.Id == view.VisaCurrency).ToList();
+                            if (temp_sdList.Count > 0)
+                            {
+                                view.VisaCurrencyStr = temp_sdList[0].Name;
+                                dic_Currency.Add(view.VisaCurrency, temp_sdList[0].Name);
+
+                            }
+                            else
+                            {
+                                view.VisaCurrencyStr = "未知";
+                                dic_Currency.Add(view.VisaCurrency, "未知");
+                            }
+
+                        }
+
                         if (view.IsAuditGM == 0) view.IsAuditGMStr = "未审核";
                         else if (view.IsAuditGM == 1) view.IsAuditGMStr = "已通过";
                         else if (view.IsAuditGM == 2) view.IsAuditGMStr = "未通过";
@@ -161,7 +185,7 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                     }
                     return result = new Result() { Code = 0, Msg = "查询成功！", Data = infoViews };
                 }
-                else if(dto.PortType==2 || dto.PortType==3)
+                else if (dto.PortType == 2 || dto.PortType == 3)
                 {
                     string sql = string.Format(@"Select * From (	
                                             Select row_number() over (order by v.Id Desc) as RowNumber,v.*,c.IsAuditGM,s.Name as VisaCurrencyStr
@@ -240,7 +264,7 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                                             Left Join Sys_SetData s On v.VisaCurrency = s.Id {0}
                                             ) temp", sqlWhere);
                     DataCount dataCount = _sqlSugar.SqlQueryable<DataCount>(CountSql).First();
-                    if (dataCount!=null)
+                    if (dataCount != null)
                     {
                         int count = dataCount.Count;
                         float totalPage = (float)count / dto.PageSize;//总页数
@@ -274,8 +298,8 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
             Result result = new Result() { Code = -2, Msg = "未知错误" };
             try
             {
-                Grp_VisaInfo _VisaInfo = _sqlSugar.Queryable<Grp_VisaInfo>().First(a => a.Id == dto.Id && a.IsDel==0);
-                Grp_CreditCardPayment _CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a=>a.CId==dto.Id && a.IsDel==0 && a.CTable==80);
+                Grp_VisaInfo _VisaInfo = _sqlSugar.Queryable<Grp_VisaInfo>().First(a => a.Id == dto.Id && a.IsDel == 0);
+                Grp_CreditCardPayment _CreditCardPayment = _sqlSugar.Queryable<Grp_CreditCardPayment>().First(a => a.CId == dto.Id && a.IsDel == 0 && a.CTable == 80);
                 var data = new
                 {
                     VisaInfo = _VisaInfo,
@@ -320,41 +344,41 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                 if (_TeamRate != null)
                 {
                     Sys_SetData _SetData = _sqlSugar.Queryable<Sys_SetData>().First(a => a.IsDel == 0 && a.Id == c.PaymentCurrency);
-                    if (_SetData!=null)
+                    if (_SetData != null)
                     {
                         currencyInfos = CommonFun.GetCurrencyChinaToList(_TeamRate.Remark);
                         CurrencyInfo CurrencyRate = currencyInfos.FirstOrDefault(a => a.CurrencyCode == _SetData.Name);
-                        if (CurrencyRate!=null)
+                        if (CurrencyRate != null)
                         {
                             c.RMBPrice = c.PayMoney * Convert.ToDecimal(CurrencyRate.Rate);
                             c.DayRate = CurrencyRate.Rate;
                         }
                     }
                 }
-               
-                if (dto.Status==1)//添加
+
+                if (dto.Status == 1)//添加
                 {
-                    Grp_VisaInfo grp_Visa =_sqlSugar.Queryable<Grp_VisaInfo>().First(a=>a.IsDel==0 && a.VisaCurrency==dto.VisaCurrency && a.VisaPrice==dto.VisaPrice && a.VisaClient==dto.VisaClient);
-                    if (grp_Visa!=null)
+                    Grp_VisaInfo grp_Visa = _sqlSugar.Queryable<Grp_VisaInfo>().First(a => a.IsDel == 0 && a.VisaCurrency == dto.VisaCurrency && a.VisaPrice == dto.VisaPrice && a.VisaClient == dto.VisaClient);
+                    if (grp_Visa != null)
                     {
                         return result = new Result() { Code = -1, Msg = "该笔费用已存在，请勿重复添加！" };
                     }
                     else
                     {
                         id = await AddAsyncReturnId(grp_Visa1);
-                        if (id!=0)
+                        if (id != 0)
                         {
                             c.CId = id;
                             int cId = await _sqlSugar.Insertable(c).ExecuteReturnIdentityAsync();
                             if (cId != 0)
                             {
-                                 result = new Result() { Code = 0, Msg = "添加成功！" };
+                                result = new Result() { Code = 0, Msg = "添加成功！" };
 
                             }
                             else
                             {
                                 RollbackTran();
-                                 result = new Result() { Code = -1, Msg = "添加失败！" };
+                                result = new Result() { Code = -1, Msg = "添加失败！" };
                             }
                         }
                         else
@@ -363,11 +387,11 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                             result = new Result() { Code = -1, Msg = "添加失败，请稍后重试！" };
                         }
                     }
-                    
+
                 }
-                else if (dto.Status==2)//修改
+                else if (dto.Status == 2)//修改
                 {
-                    
+
                     bool res = await UpdateAsync(a => a.Id == dto.Id, a => new Grp_VisaInfo
                     {
                         VisaClient = grp_Visa1.VisaClient,
@@ -382,7 +406,7 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
                     });
                     if (res)
                     {
-                        int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == grp_Visa1.Id && a.CTable==80).SetColumns(a => new Grp_CreditCardPayment
+                        int CTable = await _sqlSugar.Updateable<Grp_CreditCardPayment>().Where(a => a.CId == grp_Visa1.Id && a.CTable == 80).SetColumns(a => new Grp_CreditCardPayment
                         {
                             PayDId = dto.PayDId,
                             PayMoney = c.PayMoney,
@@ -416,7 +440,7 @@ Left Join Sys_SetData as sd1 With(Nolock) On v.VisaCurrency = sd1.Id
             }
             catch (Exception ex)
             {
-                 result = new Result() { Code = -2, Msg = ex.Message };
+                result = new Result() { Code = -2, Msg = ex.Message };
             }
             return result;
         }