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

2024-06-04 18:20:10 +08:00
parent acbd2e7678 60244b6cd9
commit 8a972ad8c9
5 changed files with 25 additions and 55 deletions
@@ -34,7 +34,7 @@ namespace YLErp.Modules.SwapModule
    public class SwapTradeAutoService : YLBaseService
    {
        protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapTradeAutoService).FullName);
-        private static string LongShortStructType = "定义文件型债券收益互换";
+        private static string LongShortStructType = "普通债券类收益互换";
        public SwapTradeAutoService(OptUserInfo optUser) : base(optUser)
        {

@@ -450,7 +450,7 @@ namespace YLErp.Modules.SwapModule
            {
                return;
            }
-            var swaptrades = DbContext.trade.Where(t => t.StructureType == "定义文件型债券收益互换"
+            var swaptrades = DbContext.trade.Where(t => t.TradeType == "收益互换"
            && t.TradeDate <= valueDate
            && t.ValidState != ConsGlobal.InValid
            && !ConsTrade.TradeCompleteStatus.Contains(t.TradeStatus)).ToList();