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 2c194d4..69dad81 100644 Binary files a/IRaCIS.Core.API/wwwroot/Template/paystub(第三方).xlsx and b/IRaCIS.Core.API/wwwroot/Template/paystub(Direct).xlsx differ diff --git a/IRaCIS.Core.API/wwwroot/Template/paystub(劳务费).xlsx b/IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx similarity index 69% rename from IRaCIS.Core.API/wwwroot/Template/paystub(劳务费).xlsx rename to IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx index 9e56ebf..2c48aa8 100644 Binary files a/IRaCIS.Core.API/wwwroot/Template/paystub(劳务费).xlsx and b/IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx differ diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 28bbb5f..ff550a9 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -219,6 +219,7 @@ namespace IRaCIS.Application.Services ShowTypeOrder = pay.ShowTypeOrder, PaymentUSD = pay.PaymentUSD, BasePrice = pay.BasePrice, + PaymentType=pay.PaymentType, PersonalAdditional = pay.PersonalAdditional, TrialAdditional = pay.TrialAdditional, TrialCode = pay.TrialCode, @@ -227,7 +228,7 @@ namespace IRaCIS.Application.Services ExchangeRate = pay.ExchangeRate, IsNewTrial = price.IsNewTrial, NewPersonalAdditional = enroll.AdjustmentMultiple, - + Count=pay.Count, }).ToList(); } @@ -1213,14 +1214,14 @@ namespace IRaCIS.Application.Services System.IO.Directory.CreateDirectory("./file"); } - if (!System.IO.Directory.Exists("./file/第三方")) + if (!System.IO.Directory.Exists("./file/云账户")) { - System.IO.Directory.CreateDirectory("./file/第三方"); + System.IO.Directory.CreateDirectory("./file/云账户"); } - if (!System.IO.Directory.Exists("./file/劳务费")) + if (!System.IO.Directory.Exists("./file/Direct")) { - System.IO.Directory.CreateDirectory("./file/劳务费"); + System.IO.Directory.CreateDirectory("./file/Direct"); } if (!System.IO.Directory.Exists("./Zip")) @@ -1243,7 +1244,7 @@ namespace IRaCIS.Application.Services var deletepaths =new List(){ - "./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");