diff --git a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs index d8978354..a41e4c64 100644 --- a/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs +++ b/Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs @@ -177,7 +177,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator dic["利差%"] = ((interestMargin?.InterestRateDefault) ?? 0) * 100; dic["参考利率"] = interestMargin?.FloatRateUnderlyingCode; dic["固定利率"] = ""; - dic["计算基准"] = interestMargin?.FloatRateUnderlyingCode +" " + ((interestMargin?.InterestRateDefault) ?? 0) * 100 + "%"; + dic["计算基准"] = interestMargin?.FloatRateUnderlyingCode + (interestMargin?.InterestRateDefault >= 0 ? " + " : "") + ((interestMargin?.InterestRateDefault) ?? 0) * 100 + "%"; dic["重置频率"] = interestMargin?.interest_rest_days + "天"; } dic["初始预付金支付日"] = trade.TradeDate?.ToString("yyyy年M月d日"); diff --git a/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs b/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs index d891b6bb..86d7f721 100644 --- a/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs +++ b/YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs @@ -627,7 +627,7 @@ namespace YLErp.Modules.TradeModule.DealModule ContractDocId = group.FirstOrDefault().ContractDocId }); } - result = contractList.OrderBy(r => r.TradeDate).AsQueryable().ToSearchList(req); + result = contractList.OrderByDescending(r => r.TradeDate).AsQueryable().ToSearchList(req); return result; } }