From b53d4cd3ccd6f892c8dbbbe8206de9eebbde44cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= Date: Mon, 20 Apr 2026 17:07:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B0=E4=BA=A4=E6=98=93OA=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=88=97=E8=A1=A8=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- YLErpDAL/Modules/TradeModule/TradeOAService.cs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs index c93716f0..81d75378 100644 --- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs +++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs @@ -262,6 +262,20 @@ namespace YLErp.Modules.TradeModule //通过UserName找到LoginName var applicantLoginName = DbContextFactory.GetErpBaseContext().SystemUsers.Where(u => u.Name == UserInfo.UserName).Select(u => u.LoginName).FirstOrDefault(); + // 构建detailList,yycl(应用场景/附件)放在明细列表中 + var detailList = new List(); + if (attachmentDataList != null && attachmentDataList.Any()) + { + foreach (var att in attachmentDataList) + { + detailList.Add(new + { + detailIndex = 1, + yycl = att + }); + } + } + // 构建dataMap var dataMap = new { @@ -295,8 +309,7 @@ namespace YLErp.Modules.TradeModule //是否签订廉洁协议 0已签 1未签 2无需签订 htbjjs = $"我司与{trade.ClientName}已完成NAFMII协议签署,并开展TRS交易:{contractCode},参与标的{trade.UnderlyingCode} {trade.UnderlyingName},参与标的数量面额{trade.OriginalStockEqvNotional}元人民币", //合同背景介绍 - // 使用附件数据列表(包含 annexId 和 annexName) - yycl = attachmentDataList?.FirstOrDefault(), + detailList = detailList.Any() ? detailList : null, creater = applicantLoginName };