#EQD-5843 国联民生-交易确认书编号规则, 客户编号规则, 以及确认书相关的一些调整：除了上传确认书

2026-05-21 10:57:14 +08:00
parent e3b11e7f5b
commit 1ca9cace72
8 changed files with 205 additions and 8 deletions
@@ -326,6 +326,8 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator

                dic["IsFixed"] = "□";
                dic["IsFloat"] = "□";
+                dic["期初观察日"] = trade.StartDate?.ToString("yyyy年M月d日") ?? "";
+                dic["期末观察日"] = trade.ExerciseDate?.ToString("yyyy年M月d日") ?? "";
                if (interestMargin != null)
                {
                    if (string.IsNullOrEmpty(interestMargin.FloatRateUnderlyingCode))
@@ -343,6 +345,13 @@ namespace YLErp.Plugins.GuoLian.DocumentGenerator
                        dic["利差"] = ((double)interestMargin.InterestRateDefault * 10000).ToString("N0");
                        dic["重置频率"] = (interestMargin.interest_rest_days ?? 0) + "天";
                    }
+                    if (interestMargin.SwapIntervalList.Count()>0)
+                    {
+                        var firstInterval = interestMargin.SwapIntervalList.OrderBy(o=>o.Date).First();
+                        var lastInterval = interestMargin.SwapIntervalList.OrderBy(o => o.Date).Last();
+                        dic["期初观察日"] = firstInterval.Date.ToString("yyyy年M月d日") ?? "";
+                        dic["期末观察日"] = firstInterval.Date.ToString("yyyy年M月d日") ?? "";
+                    }
                }
                else
                {