diff --git a/Framework/YLErp.Core/DBModels/ChinaBondValuation.cs b/Framework/YLErp.Core/DBModels/ChinaBondValuation.cs index 4e375c68..01520835 100644 --- a/Framework/YLErp.Core/DBModels/ChinaBondValuation.cs +++ b/Framework/YLErp.Core/DBModels/ChinaBondValuation.cs @@ -153,6 +153,6 @@ namespace YLErp.DBModels /// /// 聚源id /// - public string JSID { get; set; } + public long? JSID { get; set; } } } diff --git a/YLErpDAL/Modules/EodModule/EodPriceService.cs b/YLErpDAL/Modules/EodModule/EodPriceService.cs index 01541916..ea8ebfab 100644 --- a/YLErpDAL/Modules/EodModule/EodPriceService.cs +++ b/YLErpDAL/Modules/EodModule/EodPriceService.cs @@ -74,7 +74,7 @@ namespace YLErp.Modules.EodModule DeciClosePrice=0, DeciSettlePrice = 0, DeciReferencePrice=0, - JSID = "" + JSID = null }; var query2 = from un in queryUn @@ -101,7 +101,7 @@ namespace YLErp.Modules.EodModule DeciClosePrice = 0, DeciSettlePrice = 0, DeciReferencePrice = 0, - JSID="" + JSID=null }; var query3 = from un in queryUn join bondClose in DbContext.china_bond_valuation.Where(predicatEob) on un.UnderlyingCode equals bondClose.bond_id @@ -145,7 +145,7 @@ namespace YLErp.Modules.EodModule item.SettlePrice=Convert.ToDouble(item.DeciSettlePrice); item.ClosePrice = Convert.ToDouble(item.DeciClosePrice); item.ReferencePrice = Convert.ToDouble(item.DeciReferencePrice); - if (!string.IsNullOrEmpty(item.JSID)) + if (item.JSID.HasValue) { item.DataSource = "系统"; } @@ -337,6 +337,6 @@ namespace YLErp.Modules.EodModule public bool IsBond { get; set; } - public string JSID { get; set; } + public long? JSID { get; set; } } }