BigFix 确认书客户信息 预付金额 计算基准 重置频率等字段逻辑修改 确认书用印上传 修改交易去掉交易确认书 默认按交易日期排序

YLErpDAL/Modules/TradeModule/DealModule/TradeContractGenerateService.cs

@@ -1,4 +1,5 @@
 using BaseOUDAL;
+using DocumentFormat.OpenXml.Office.Word;
 using System.Collections.Concurrent;
 using System.Drawing.Printing;
 using YLErp.Configuration;
@@ -562,7 +563,11 @@ namespace YLErp.Modules.TradeModule.DealModule
                             tcd.SealResult,
                             ContractId = tcr != null ? tcr.id : 0,
                             sp.PositionType,
-                            t.SentMailCount
+                            t.SentMailCount,
+                            tcd.StampDocumentFileName,
+                            tcr.OptDate,
+                            tcr.OptName,
+                            ContractDocId = tcd != null ? tcd.id : 0,
                         };
 
             if (req.StartDate != null && req.StartDate != DateTime.MinValue)
@@ -616,9 +621,13 @@ namespace YLErp.Modules.TradeModule.DealModule
                     tradeCount = group.Select(x => x.id).Distinct().Count(),
                     PositionType = group.FirstOrDefault().PositionType,
                     SentMailCount = group.FirstOrDefault().SentMailCount ?? 0,
+                    StampDocumentFileName = group.FirstOrDefault().StampDocumentFileName,
+                    OptDate = group.FirstOrDefault().OptDate,
+                    OptName = group.FirstOrDefault().OptName,
+                    ContractDocId = group.FirstOrDefault().ContractDocId    
                 });
             }
-            result = contractList.AsQueryable().ToSearchList(req);
+            result = contractList.OrderBy(r => r.TradeDate).AsQueryable().ToSearchList(req);
             return result;           
         }
     }
@@ -653,6 +662,7 @@ namespace YLErp.Modules.TradeModule.DealModule
         
         public List<int>? PositionTypes { get; set; }
 
+
     }
 
     public class clientContractR
@@ -689,5 +699,13 @@ namespace YLErp.Modules.TradeModule.DealModule
 
         public int SentMailCount { get; set; }
 
+        public string StampDocumentFileName { get; set; }
+
+        public DateTime? OptDate { get; set; }
+
+        public string OptName { get; set; }
+
+        public int ContractDocId { get; set; }
+
     }
 }