#EQD-5718 【缺陷转需求】-国联民生-利息端计息方式与结算规则扩充

YLErpWeb/Controllers/SwapTrade2Controller.cs

@@ -153,6 +153,17 @@ namespace YLErp.Web.Controllers
             return JsonSuccess("");
         }
         /// <summary>
+        /// 校验收益结算操作（不检查收盘限制）
+        /// </summary>
+        /// <param name="enid"></param>
+        /// <returns></returns>
+        public JsonResult CheckEodTradeForIncome(string enid)
+        {
+            var intid = DecryptInt(enid);
+            new SwapDealService(CurUser).CheckEodTradeForIncome(intid);
+            return JsonSuccess("");
+        }
+        /// <summary>
         /// 收益互换 平仓
         /// </summary>
         /// <param name="enid"></param>

YLErpWeb/Controllers/tradeController.cs

@@ -1,4 +1,4 @@
-using iTextSharp.text;
+using iTextSharp.text;
 using iTextSharp.text.pdf;
 using NPOI.POIFS.Crypt;
 using Qdp.Pricing.Base.Enums;
@@ -3456,6 +3456,14 @@ namespace YLErp.Web.Controllers
             return JsonSuccess("", QdpObservationHelper.GetDatesWithFixedTerm(req.startDate, req.endDate, req.termStr, bdc, req.alignEnd, req.calcMode));
         }
 
+        [HttpPost]
+        public JsonResult GetSwapObservationDateList(GetSwapObservationDateRequest req)
+        {
+            var bdc = (BusinessDayConvention)Enum.Parse(typeof(BusinessDayConvention), req.holidayAdjustment);
+            var results = QdpObservationHelper.GetObservationAndSettleDates(req.startDate, req.endDate, req.termStr, req.calendar, req.settlementRules, bdc, req.alignEnd, req.calcMode);
+            return JsonSuccess("", results);
+        }
+
         public ActionResult StructureList(string structure, string CalcId, bool onlyshow = false)
         {
             var ret = new DZStructureService(CurUser).getStructureList(structure);