2 Commits 3838fcff66 ... e87045fe8b

Author SHA1 Message Date
  zhaiy e87045fe8b Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop 1 month ago
  zhaiy 939e12a427 收款账单,添加currencyStr字段 1 month ago

+ 1 - 1
OASystem/OASystem.Domain/ViewModels/Financial/Fin_ForeignReceivablesView.cs

@@ -204,7 +204,7 @@ namespace OASystem.Domain.ViewModels.Financial
         /// <summary>
         /// 币种Str
         /// </summary>
-        public int CurrencyStr { get; set; }
+        public string CurrencyStr { get; set; }
 
         /// <summary>
         /// 添加方式   

+ 3 - 2
OASystem/OASystem.Infrastructure/Repositories/Financial/ForeignReceivablesRepository.cs

@@ -410,8 +410,9 @@ namespace OASystem.Infrastructure.Repositories.Financial
             //应收款项
             string groupReceivedSql = string.Format(@"Select *,su.CnName As AuditorName, ssd.Name  as 'CurrencyStr'  From Fin_ForeignReceivables  ffr
 Left Join Sys_Users su On  ffr.Auditor = su.Id
-Where ffr.IsDel=0 And ffr.Diid={0}
-LEFT JOIN  Sys_SetData ssd  on ffr.Currency  = ssd.Id  AND  ssd.IsDel  = 0", dto.DiId);
+LEFT JOIN  Sys_SetData ssd  on ffr.Currency  = ssd.Id  AND  ssd.IsDel  = 0
+Where ffr.IsDel=0 And ffr.Diid={0}", dto.DiId);
+
             var groupReceivedList = await _sqlSugar.SqlQueryable<ProceedsReceivedNewView>(groupReceivedSql).ToListAsync();
 
             result.Code = 200;