成交簿记打印错误日志&报送填报下拉值保存枚举

Framework/YLErp.Core/DBModels/Consts/ConsReport.cs

@@ -1646,7 +1646,7 @@ namespace YLErp.DBModels.Consts
                 {
                     _performanceCollRangeMapDisplay = new ExpandoDictionary<string, string>(new Dictionary<string, string>()
                     {
-                        {"仅限本笔交易","0"},
+                        {"仅本笔交易","0"},
                         {"本笔交易对应主协议框架下的所有交易(在附件中上传履约担保协议)","1"},
                         {"其他情况下多笔交易(在附件中上传履约担保协议)","2"},
                     });

YLErpDAL/Modules/SwapModule/SwapRateService.cs

@@ -380,7 +380,7 @@ namespace YLErp.Modules.SwapModule
         }
         public void SendAllSwapRateToKafka()
         {
-            var swapRates = DbContext.swap_rate.Where(x => x.TakeEffectDate <= DateTime.Now.Date).GroupBy(g => g.ClientId).Select(g => g.OrderByDescending(o => o.TakeEffectDate).FirstOrDefault()).ToList();
+            var swapRates = DbContext.swap_rate.Where(x => x.TakeEffectDate <= DateTime.Now.Date).ToList().GroupBy(g => g.ClientId).Select(g => g.OrderByDescending(o => o.TakeEffectDate).FirstOrDefault()).ToList();
             var swapRateAll = DbContext.swap_rate
               .Where(x => x.ClientId == 0 && x.TakeEffectDate <= DateTime.Now.Date)
               .OrderByDescending(o => o.TakeEffectDate)

YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs

@@ -418,8 +418,8 @@ namespace YLErp.Modules.TradeModule.DealModule
             trade_Report.IsUsePerformanceColl = "否";
             trade_Report.PerformanceExplain = "详见交易确认书。";
             trade_Report.IsPerformanceCollInterest = "否";
-            trade_Report.PerformanceCollType = "现金";
-            trade_Report.PerformanceCollRange = "仅本笔交易";
+            trade_Report.PerformanceCollType = "0";
+            trade_Report.PerformanceCollRange = "0";
             trade_Report.InitialPerformanceColl = (decimal)marinRate.InitMarginRate*100;
             trade_Report.RecoveryPerformanceColl = (decimal)marinRate.MaintenanceRate * 100;
             trade_Report.UnwindPerformanceColl = trade_Report.RecoveryPerformanceColl;

YLErpWeb/Controllers/tradeController.cs

@@ -8871,8 +8871,8 @@ namespace YLErp.Web.Controllers
                 trade_Report.RecoveryPerformanceColl = (decimal)marinRate.MaintenanceRate * 100;
                 trade_Report.UnwindPerformanceColl = trade_Report.RecoveryPerformanceColl;
                 trade_Report.EodPerformanceColl = trade_Report.RecoveryPerformanceColl;
-                trade_Report.PerformanceCollType = "现金";
-                trade_Report.PerformanceCollRange = "仅本笔交易";
+                trade_Report.PerformanceCollType = "0";
+                trade_Report.PerformanceCollRange = "0";
                 trade_Report.PerformanceRemark = "详见交易确认书及定义性文件";
                 #endregion
             }

YLErpWeb/Hubs/SwapConfirmSendEmailHub.cs

@@ -11,6 +11,7 @@ namespace YLErp.Web.Hubs
     public class SwapConfirmSendEmailHub : Hub
     {
         private static bool isProcessing = false;
+        protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapConfirmSendEmailHub).FullName);
         static readonly Dictionary<string, DateTime> _dic = new Dictionary<string, DateTime>(StringComparer.OrdinalIgnoreCase);
         static readonly Dictionary<string, string> _clientProgressDic = new Dictionary<string, string>();
         public async Task StartProcessing(string jsonString)
@@ -77,6 +78,7 @@ namespace YLErp.Web.Hubs
             }
             catch (Exception ex)
             {
+                Log.Error("确认书发邮件报错", ex);
                 isProcessing = false;
                 await client.SendAsync("ExceptionMessage", ex.Message);
             }

YLErpWeb/Hubs/SwapFlowCombookingHub.cs

@@ -16,6 +16,7 @@ namespace YLErp.Web.Hubs
     {
         private static bool isProcessing = false;
         private static string currentStep = null;
+        protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapFlowCombookingHub).FullName);
         public async Task StartProcessing( string jsonString)
         {
             SwpFlowCombookingReq req = JsonHelper.Deserialize<SwpFlowCombookingReq>(jsonString);
@@ -92,6 +93,7 @@ namespace YLErp.Web.Hubs
             }
             catch (Exception ex)
             {
+                Log.Error("成交簿记报错",ex);
                 isProcessing = false;
                 await client.SendAsync("ExceptionMessage", ex.Message);
             }

YLErpWeb/Hubs/SwapFlowResetHub.cs

@@ -9,6 +9,7 @@ namespace YLErp.Web.Hubs
     public class SwapFlowResetHub:Hub
     {
         private static bool isProcessing = false;
+        protected static IYcLogger Log = LogFactory.GetLogger(typeof(SwapFlowResetHub).FullName);
         public async Task StartProcessing(string jsonString)
         {
             SwpFlowResetReq req = JsonHelper.Deserialize<SwpFlowResetReq>(jsonString);
@@ -55,6 +56,7 @@ namespace YLErp.Web.Hubs
             }
             catch (Exception ex)
             {
+                Log.Error("簿记重置报错", ex);
                 isProcessing = false;
                 await client.SendAsync("ExceptionMessage", ex.Message);
             }

YLErpWeb/Views/trade/tradeSubmissionFields.cshtml

@@ -286,7 +286,7 @@
                     <select v-model="trade_report.PerformanceCollType">
                         @foreach (var item in YLErp.DBModels.Consts.ConsReport.PerformanceCollTypeMapDisplay)
                         {
-                            <option>@item.Key</option>
+                            <option value="@item.Value">@item.Key</option>
                         }
                     </select>
                 </div>
@@ -296,7 +296,7 @@
                     <select v-model="trade_report.PerformanceCollRange">
                         @foreach (var item in YLErp.DBModels.Consts.ConsReport.PerformanceCollRangeMapDisplay)
                         {
-                            <option>@item.Key</option>
+                            <option value="@item.Value">@item.Key</option>
                         }
                     </select>
                 </div>