From 0759bddd2ed541b15d1efaec335937824688a244 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 13 Sep 2022 13:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Š¡è´¹).xlsx => Payroll Summary_(Direct).xlsx} | Bin ...¸‰æ–¹).xlsx => Payroll Summary_(云账户).xlsx} | Bin ...stub(第三方).xlsx => paystub(Direct).xlsx} | Bin 9650 -> 9651 bytes ...stub(劳务费).xlsx => paystub(云账户).xlsx} | Bin 9652 -> 9654 bytes .../Financial/FinancialService.cs | 29 +++++++++--------- 5 files changed, 15 insertions(+), 14 deletions(-) rename IRaCIS.Core.API/wwwroot/Template/{Payroll Summary_(劳务费).xlsx => Payroll Summary_(Direct).xlsx} (100%) rename IRaCIS.Core.API/wwwroot/Template/{Payroll Summary_(第三方).xlsx => Payroll Summary_(云账户).xlsx} (100%) rename IRaCIS.Core.API/wwwroot/Template/{paystub(第三方).xlsx => paystub(Direct).xlsx} (61%) rename IRaCIS.Core.API/wwwroot/Template/{paystub(劳务费).xlsx => paystub(云账户).xlsx} (69%) diff --git a/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(劳务费).xlsx b/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(Direct).xlsx similarity index 100% rename from IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(劳务费).xlsx rename to IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(Direct).xlsx diff --git a/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(第三方).xlsx b/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(云账户).xlsx similarity index 100% rename from IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(第三方).xlsx rename to IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(云账户).xlsx diff --git a/IRaCIS.Core.API/wwwroot/Template/paystub(第三方).xlsx b/IRaCIS.Core.API/wwwroot/Template/paystub(Direct).xlsx similarity index 61% rename from IRaCIS.Core.API/wwwroot/Template/paystub(第三方).xlsx rename to IRaCIS.Core.API/wwwroot/Template/paystub(Direct).xlsx index 2c194d427f6c2a992da6e00c4cf3d62040ad34f9..69dad819ddaaf85394dc067cf9e37073144db579 100644 GIT binary patch delta 2763 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 - "./file/劳务费","./file/第三方" ,"./file" + "./file/Direct","./file/云账户" ,"./file" }; @@ -1295,10 +1296,10 @@ namespace IRaCIS.Application.Services }; remunerationInfo.Rows.Add(remunerationSingle); - var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(劳务费).xlsx"); + var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(Direct).xlsx"); // 导入excel - MiniExcel.SaveAsByTemplate($"./file/劳务费/{item.ChineseName}_paystub_{item.YearMonth}(劳务费).xlsx", path, remunerationSingle); + MiniExcel.SaveAsByTemplate($"./file/Direct/{item.ChineseName}_paystub_{item.YearMonth}(Direct).xlsx", path, remunerationSingle); } @@ -1321,18 +1322,18 @@ namespace IRaCIS.Application.Services }; cloudPaymentInfo.Rows.Add(cloudPaymentSingle); - var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(第三方).xlsx"); - MiniExcel.SaveAsByTemplate($"./file/第三方/{item.ChineseName}_paystub_{item.YearMonth}(第三方).xlsx", path, cloudPaymentSingle); + var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(云账户).xlsx"); + MiniExcel.SaveAsByTemplate($"./file/云账户/{item.ChineseName}_paystub_{item.YearMonth}(云账户).xlsx", path, cloudPaymentSingle); } - var remunerationPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(劳务费).xlsx"); - MiniExcel.SaveAsByTemplate($"./file/劳务费/Payroll Summary_{remunerationInfo.YearMonth}(劳务费).xlsx", remunerationPath, remunerationInfo); + var remunerationPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(Direct).xlsx"); + MiniExcel.SaveAsByTemplate($"./file/Direct/Payroll Summary_{remunerationInfo.YearMonth}(Direct).xlsx", remunerationPath, remunerationInfo); - var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(第三方).xlsx"); - MiniExcel.SaveAsByTemplate($"./file/第三方/Payroll Summary_{cloudPaymentInfo.YearMonth}(第三方).xlsx", cloudPaymentPath, cloudPaymentInfo); + var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(云账户).xlsx"); + MiniExcel.SaveAsByTemplate($"./file/云账户/Payroll Summary_{cloudPaymentInfo.YearMonth}(云账户).xlsx", cloudPaymentPath, cloudPaymentInfo); ZipFile.CreateFromDirectory("./file", "Zip/Payroll.zip");