From bb3645929a05e8e4941e3b4d8a421c4faceab4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <2452821485@qq.com>
Date: Wed, 23 Apr 2025 16:24:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=A5=E6=9C=9F=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=BA=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TradeModule/DealModule/TradeContractGenerateService.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;           
         }
     }

From dfc1adef8b4187f3dd44e0bdbd88f9543805116d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <2452821485@qq.com>
Date: Wed, 23 Apr 2025 16:28:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=9F=BA=E5=87=86=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8C=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DocumentGenerator/TradeConfirmationGenerator.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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日");