会务成本多文件下载完善

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -26596,7 +26596,6 @@ ORDER BY
             return Ok(JsonView(true, "操作成功！"));
         }
 
-
         /// <summary>
         /// 子项数据删除
         /// </summary>
@@ -26690,22 +26689,8 @@ ORDER BY
             var networkPath = outputPath.Replace(AppSettingsHelper.Get("ExcelBasePath"), AppSettingsHelper.Get("ExcelBaseUrl") + AppSettingsHelper.Get("ExcelFtpPath"));
             var field = string.Empty;
             var fileTypeName = string.Empty;
-
-            if (Dto.FileTypeId == 0)
-            {
-
-            }
-            else if (Dto.FileTypeId == 1)
-            {
-
-            }
-            else if (Dto.FileTypeId == 2)
-            {
-                loadPath += "会务成本总表.xlsx";
-                outputPath += $"{di.TeamName}_会务成本总表.xlsx";
-                networkPath += $"{di.TeamName}_会务成本总表.xlsx";
-                field = @$"
-                     a.[Index],a.PriceName,a.CostPrice,a.Count,a.Coefficient,a.BaoJiaPrice,a.AddedValue,a.Details,a.Remark,
+            field = @$"
+                     a.[Index],a.PriceName,a.CostPrice,a.Count,a.Coefficient,a.BaoJiaPrice,a.AddedValue,a.Details,a.Remark,a.Rate,
                             b.Name as PriceTypeStr ,
                             c.Name as CurrencyStr ,
                             d.Name as UnitStr ,
@@ -26716,7 +26701,27 @@ ORDER BY
                                      ELSE '未审核'
                                 END AS ReviewStatusStr 
                 ";
+
+            if (Dto.FileTypeId == 0)
+            {
+                fileTypeName = "会务成本成本表";
+                loadPath += $"{fileTypeName}.xlsx";
+                outputPath += $"{di.TeamName}_{fileTypeName}.xlsx";
+                networkPath += $"{di.TeamName}_{fileTypeName}.xlsx";
+            }
+            else if (Dto.FileTypeId == 1)
+            {
+                fileTypeName = "会务成本报价表";
+                loadPath += $"{fileTypeName}.xlsx";
+                outputPath += $"{di.TeamName}_{fileTypeName}.xlsx";
+                networkPath += $"{di.TeamName}_{fileTypeName}.xlsx";
+            }
+            else if (Dto.FileTypeId == 2)
+            {
                 fileTypeName = "会务成本总表";
+                loadPath += $"{fileTypeName}.xlsx";
+                outputPath += $"{di.TeamName}_{fileTypeName}.xlsx";
+                networkPath += $"{di.TeamName}_{fileTypeName}.xlsx";
             }
 
             var chiExcelContent = _sqlSugar.SqlQueryable<ConferenceAffairsExcelContent>(@$"
@@ -26732,6 +26737,14 @@ ORDER BY
                   AND a.ConferenceAffairsCostId  = {main.Id}
             ").ToList();
 
+            var currLists = chiExcelContent.Select(x => new CurrList
+                                            {
+                                                CurrName = x.CurrencyStr,
+                                                CurrRate = x.Rate
+                                            })
+                                            .Distinct()
+                                            .ToList();
+
             var designer = new WorkbookDesigner
             {
                 Workbook = new Workbook(loadPath)
@@ -26745,7 +26758,7 @@ ORDER BY
             DataTable dt = CommonFun.GetDataTableFromIList<ConferenceAffairsExcelContent>(chiExcelContent);
             dt.TableName = "TB";
             designer.SetDataSource(dt);
-            DataTable dt1 = CommonFun.GetDataTableFromIList<CurrList>(Dto.CurrLists);
+            DataTable dt1 = CommonFun.GetDataTableFromIList<CurrList>(currLists);
             dt1.TableName = "currTb";
             designer.SetDataSource(dt1);
 

OASystem/OASystem.Domain/Dtos/Groups/ConferenceAffairsInIt.cs

@@ -77,7 +77,7 @@ namespace OASystem.Domain.Dtos.Groups
         public int FileTypeId { get; set; }
         public int GroupId { get; set; }
 
-        public List<CurrList> CurrLists { get; set; }
+        //public List<CurrList> CurrLists { get; set; }
     }
 
     public class CurrList
@@ -128,5 +128,10 @@ namespace OASystem.Domain.Dtos.Groups
 
         /// <summary>&=[TB].ReviewStatusStr</summary>
         public string ReviewStatusStr { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 汇率
+        /// </summary>
+        public decimal Rate { get; set; }
     }
 }