From da85489c7ce93a368a806bfe04feed8d295ab5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Mon, 16 Mar 2026 10:52:15 +0800
Subject: [PATCH] =?UTF-8?q?OA=E5=AD=97=E6=AE=B5=E5=8F=96=E5=80=BC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Modules/TradeModule/TradeOAService.cs     | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/YLErpDAL/Modules/TradeModule/TradeOAService.cs b/YLErpDAL/Modules/TradeModule/TradeOAService.cs
index 261da149..be922de1 100644
--- a/YLErpDAL/Modules/TradeModule/TradeOAService.cs
+++ b/YLErpDAL/Modules/TradeModule/TradeOAService.cs
@@ -101,8 +101,8 @@ namespace YLErp.Modules.TradeModule
         /// 上传附件到OA系统
         /// </summary>
         /// <param name="filePath">文件路径</param>
-        /// <returns>附件ID列表</returns>
-        private async Task<List<string>> UploadAttachmentAsync(string filePath)
+        /// <returns>附件数据列表（包含 annexId 和 annexName）</returns>
+        private async Task<List<UploadAttachmentData>> UploadAttachmentAsync(string filePath)
         {
             try
             {
@@ -161,10 +161,9 @@ namespace YLErp.Modules.TradeModule
                                 {
                                     if (uploadResponse.code == "0" && uploadResponse.data != null)
                                     {
-                                        // 提取annexId
-                                        var annexIds = uploadResponse.data.Select(item => item.annexId).ToList();
-                                        logger.Info($"成功上传附件，获取到{annexIds.Count}个附件ID");
-                                        return annexIds;
+                                        // 返回完整的附件数据列表（包含 annexId 和 annexName）
+                                        logger.Info($"成功上传附件，获取到{uploadResponse.data.Count}个附件");
+                                        return uploadResponse.data;
                                     }
                                     else
                                     {
@@ -237,13 +236,13 @@ namespace YLErp.Modules.TradeModule
                 }
 
                 // 处理附件
-                List<string> annexIds = null;
+                List<UploadAttachmentData> attachmentDataList = null;
                 if (tdoc != null && !string.IsNullOrEmpty(tdoc.AbsolutePath))
                 {
                     try
                     {
-                        annexIds = await UploadAttachmentAsync(tdoc.AbsolutePath);
-                        logger.Info($"成功上传附件并获取到annexId：{string.Join(", ", annexIds)}");
+                        attachmentDataList = await UploadAttachmentAsync(tdoc.AbsolutePath);
+                        logger.Info($"成功上传附件并获取到annexId：{string.Join(", ", attachmentDataList.Select(a => a.annexId))}");
                     }
                     catch (Exception ex)
                     {
@@ -271,23 +270,23 @@ namespace YLErp.Modules.TradeModule
                     //去除后缀
                     htmc = Path.GetFileNameWithoutExtension(tdoc.FileName),//合同名称
                     sfgljy = 1,//是否关联交易 0是　1否
-                    jflx = "企业",//甲方类型
+                    jflx = 0,//甲方类型 0企业 1个人
                     jf = trade.ClientName,//甲方
-                    yflx = "企业",//乙方类型
+                    yflx = 0,//乙方类型 0企业 1个人
                     yf = "国联民生证券股份有限公司",//乙方
                     sfdxtzdfqsjf = 1,//是否短信通知对方签署 0是　1否
                     sfdxtzyf = 1,//是否短信通知乙方 0是　1否
                     htje = trade.OriginalStockEqvNotional,//合同金额
-                    htyxksrq = trade.StartDate?.ToString("yyyyMMdd"),//合同有效期开始日期
-                    htyxjsrq = trade.ExerciseDate?.ToString("yyyyMMdd"),//合同有效期结束日期
+                    htyxksrq = trade.StartDate?.ToString("yyyy-MM-dd"),//合同有效期开始日期
+                    htyxjsrq = trade.ExerciseDate?.ToString("yyyy-MM-dd"),//合同有效期结束日期
                     bz = "人民币",//币种
-                    htqdrq = DateTime.Now.ToString("yyyyMMdd"),//合同签订日期
+                    htqdrq = DateTime.Now.ToString("yyyy-MM-dd"),//合同签订日期
                     sfqdljxy = 2,
                     //是否签订廉洁协议 0已签　1未签　2无需签订
                     htbjjs = $"我司与{trade.ClientName}已完成NAFMII协议签署，并开展TRS交易：{contractCode}，参与标的{trade.UnderlyingCode} {trade.UnderlyingName}，参与标的数量面额{trade.OriginalStockEqvNotional}元人民币",
                     //合同背景介绍
-                    // 使用annexId替代Base64编码
-                    fj = annexIds?.FirstOrDefault(),
+                    // 使用附件数据列表（包含 annexId 和 annexName）
+                    fj = attachmentDataList?.FirstOrDefault(),
                     creater = applicantLoginName
                 };