From f17bc98345f8de53c9a798750ea4cdf955239559 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 29 Sep 2022 09:22:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wwwroot/Template/Payment Summary.xlsx | Bin 9841 -> 9852 bytes .../Financial/FinancialService.cs | 9 +++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.API/wwwroot/Template/Payment Summary.xlsx b/IRaCIS.Core.API/wwwroot/Template/Payment Summary.xlsx index c531d379a16ed28b47c69db6a054e6ef9f4c2ee8..453243df0a4a770681d8f24867cbb88a63217933 100644 GIT binary patch delta 4734 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 delta 4703 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 H{*C+#JfNsE diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 799332d..3e287d3 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -1229,10 +1229,7 @@ namespace IRaCIS.Application.Services } - if (!System.IO.Directory.Exists("./file/Summary")) - { - System.IO.Directory.CreateDirectory("./file/Summary"); - } + if (!System.IO.Directory.Exists("./Zip")) { @@ -1254,7 +1251,7 @@ namespace IRaCIS.Application.Services var deletepaths =new List(){ - "./file/Direct","./file/云账户" ,"./file/Summary","./file" + "./file/Direct","./file/云账户" ,"./file" }; @@ -1367,7 +1364,7 @@ namespace IRaCIS.Application.Services ExchangeRate = _exchangeRateService.GetExchangeRateByMonth(inDto.YearMonth) }; - MiniExcel.SaveAsByTemplate($"./file/Summary/Payroll Summary_{inDto.YearMonth}.xlsx", summaryPaymentPath, summaryPaymentData); + MiniExcel.SaveAsByTemplate($"./file/Payroll Summary_{inDto.YearMonth}.xlsx", summaryPaymentPath, summaryPaymentData); ZipFile.CreateFromDirectory("./file", "Zip/Payroll.zip");