++++

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -26498,8 +26498,7 @@ ORDER BY
                 else
                 {
                     _sqlSugar.Updateable<Grp_ConferenceAffairsCost>(data)
-                        .IgnoreColumns(x => new { x.Id })
-                        .ExecuteCommand();
+                             .ExecuteCommand();
                     data.Id = data.Id;
                 }
 
@@ -26513,7 +26512,7 @@ ORDER BY
 
                     var inrsetCount = insertArr.Any() ? _sqlSugar.Insertable<Grp_ConferenceAffairsCostChild>(insertArr).ExecuteCommand() : 0;
                     var updateCount = updateArr.Any() ? _sqlSugar.Updateable<Grp_ConferenceAffairsCostChild>(updateArr)
-                        .IgnoreColumns(x=> new { x.ConferenceAffairsCostId, x.Id,})
+                        .IgnoreColumns(x=> new { x.ConferenceAffairsCostId })
                         .ExecuteCommand() : 0;
                 }
 
@@ -26761,10 +26760,15 @@ ORDER BY
                 Workbook = new Workbook(loadPath)
             };
 
+            var MostCurr = _sqlSugar.Queryable<Sys_SetData>().First(x=>x.IsDel == 0 && x.Id == main.MostCurr);
+            MostCurr ??= new Sys_SetData { Name = "暂无！" };
+
             designer.SetDataSource("TeamName", di.TeamName);
             designer.SetDataSource("City", main.City);
             designer.SetDataSource("AllCost", main.CostAll);
             designer.SetDataSource("AllBaoJia", main.BaoJiaAll);
+            designer.SetDataSource("Curr", MostCurr.Name);
+            designer.SetDataSource("Curr1", MostCurr.Name);
 
             DataTable dt = CommonFun.GetDataTableFromIList<ConferenceAffairsExcelContent>(chiExcelContent);
             dt.TableName = "TB";

OASystem/OASystem.Domain/Entities/Groups/ConferenceAffairsCost.cs

@@ -55,6 +55,11 @@ namespace OASystem.Domain.Entities.Groups
         /// 报价总计
         /// </summary>
         public decimal BaoJiaAll { get; set; }
+
+        /// <summary>
+        /// 最终币种
+        /// </summary>
+        public int MostCurr { get; set; }
     }
 
 

OASystem/OASystem.Domain/ViewModels/Groups/ConferenceAffairsCostView.cs

@@ -58,6 +58,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public decimal BaoJiaAll { get; set; }
 
+        /// <summary>
+        /// 最终币种
+        /// </summary>
+        public int MostCurr { get; set; }
+
     }