Merge branch 'main' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs

2025-04-23 16:34:40 +08:00
parent fe40fa7c7d dfc1adef8b
commit 8e0a46d899
2 changed files with 2 additions and 2 deletions
@@ -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日");
@@ -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;           
        }
    }