From cbe70f5b4a28c9c1eb3ecfe919b7745b99f38899 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 25 Dec 2023 14:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.API/IRaCIS.Core.API.csproj | 16 +++++++++++++- IRaCIS.Core.API/appsettings.json | 13 ++++++------ ....xlsx => Payroll Summary_(CloudAccount).xlsx} | Bin ...账户).xlsx => paystub(CloudAccount).xlsx} | Bin .../Financial/DTO/PaymentViewModel.cs | 2 +- .../Financial/FinancialService.cs | 20 +++++++++--------- 6 files changed, 33 insertions(+), 18 deletions(-) rename IRaCIS.Core.API/wwwroot/Template/{Payroll Summary_(云账户).xlsx => Payroll Summary_(CloudAccount).xlsx} (100%) rename IRaCIS.Core.API/wwwroot/Template/{paystub(云账户).xlsx => paystub(CloudAccount).xlsx} (100%) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.csproj b/IRaCIS.Core.API/IRaCIS.Core.API.csproj index 5d0e15f..36bc645 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj +++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj @@ -68,13 +68,27 @@ - PreserveNewest + + Always + + + Always + + + Always + + + Always + + + Always + diff --git a/IRaCIS.Core.API/appsettings.json b/IRaCIS.Core.API/appsettings.json index a39018b..7ca937d 100644 --- a/IRaCIS.Core.API/appsettings.json +++ b/IRaCIS.Core.API/appsettings.json @@ -1,5 +1,6 @@ { "ConnectionStrings": { + // "RemoteNew": "Server=101.132.193.237,1434;Database=IRaCIS_History_Cost;User ID=sa;Password=zhanying@2021;", --正式 "RemoteNew": "Server=123.56.94.154,1433\\MSSQLSERVER;Database=IRaCIS_P;User ID=sa;Password=dev123456DEV;", "hang": "Server=ZHOU;Database=IRaCIS;User ID=sa;Password=sa123456;" //"RemoteTest": "Server=123.56.181.144,14333\\MSSQLExpress14;Database=IRaCIS_B;User ID=sa;Password=dev123456DEV;" @@ -14,20 +15,20 @@ }, "AllowedHosts": "*", "JwtSetting": { - "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // Կ - "Issuer": "jwtIssuertest1", // ䷢ - "Audience": "jwtAudiencetest1", // - "TokenExpireDays": "7" // ʱ䣨7day + "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // ��Կ + "Issuer": "jwtIssuertest1", // �䷢�� + "Audience": "jwtAudiencetest1", // ������ + "TokenExpireDays": "7" // ����ʱ�䣨7day�� }, "RootUrl": "http://123.56.181.144:8000", "CodePrefix": "RE", "UserCodePrefix": "U", "VisitPlanNumPrefix": "VT", - "StoredFilesPath": "D:\\Upload", //ýڵûõ + "StoredFilesPath": "D:\\Upload", //�ýڵ�û�õ� "DicomFileArchivedPath": "D:\\Upload", // "Share": false, // "FileSizeLimit": 1073741824, - "LoginExpiredTimeSpan": "15", // Minute + "LoginExpiredTimeSpan": "��15", // Minute "OpenLog": true, "AddClinicalInfo": true, "easycaching": { diff --git a/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(云账户).xlsx b/IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(CloudAccount).xlsx similarity index 100% rename from IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(云账户).xlsx rename to IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(CloudAccount).xlsx diff --git a/IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx b/IRaCIS.Core.API/wwwroot/Template/paystub(CloudAccount).xlsx similarity index 100% rename from IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx rename to IRaCIS.Core.API/wwwroot/Template/paystub(CloudAccount).xlsx diff --git a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs index 9efd049..f9f7386 100644 --- a/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs +++ b/IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs @@ -69,7 +69,7 @@ namespace IRaCIS.Application.ViewModels { get { - return PaymentMethod == PaymentMethod.CloudPayment ? "云账户" : "Direct"; + return PaymentMethod == PaymentMethod.CloudPayment ? "CloudAccount" : "Direct"; } } } diff --git a/IRaCIS.Core.Application/Financial/FinancialService.cs b/IRaCIS.Core.Application/Financial/FinancialService.cs index 8a91d43..f16f200 100644 --- a/IRaCIS.Core.Application/Financial/FinancialService.cs +++ b/IRaCIS.Core.Application/Financial/FinancialService.cs @@ -1,4 +1,4 @@ -using AutoMapper; +using AutoMapper; using AutoMapper.QueryableExtensions; using IRaCIS.Application.ExpressionExtend; using IRaCIS.Application.Interfaces; @@ -1218,9 +1218,9 @@ namespace IRaCIS.Application.Services System.IO.Directory.CreateDirectory("./file"); } - if (!System.IO.Directory.Exists("./file/云账户")) + if (!System.IO.Directory.Exists("./file/CloudAccount")) { - System.IO.Directory.CreateDirectory("./file/云账户"); + System.IO.Directory.CreateDirectory("./file/CloudAccount"); } if (!System.IO.Directory.Exists("./file/Direct")) @@ -1251,7 +1251,7 @@ namespace IRaCIS.Application.Services var deletepaths =new List(){ - "./file/Direct","./file/云账户" ,"./file" + "./file/Direct","./file/CloudAccount" ,"./file" }; @@ -1329,24 +1329,24 @@ namespace IRaCIS.Application.Services }; cloudPaymentInfo.Rows.Add(cloudPaymentSingle); - var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(云账户).xlsx"); - MiniExcel.SaveAsByTemplate($"./file/云账户/{item.ChineseName}_paystub_{inDto.YearMonth}(云账户).xlsx", path, cloudPaymentSingle); + var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/paystub(CloudAccount).xlsx"); + MiniExcel.SaveAsByTemplate($"./file/CloudAccount/{item.ChineseName}_paystub_{inDto.YearMonth}(CloudAccount).xlsx", path, cloudPaymentSingle); } remunerationInfo.YearMonth = inDto.YearMonth; cloudPaymentInfo.YearMonth = inDto.YearMonth; - var remunerationPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(Direct).xlsx"); + var remunerationPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/Payroll Summary_(Direct).xlsx"); MiniExcel.SaveAsByTemplate($"./file/Direct/Payroll Summary_{inDto.YearMonth}(Direct).xlsx", remunerationPath, remunerationInfo); - var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(云账户).xlsx"); - MiniExcel.SaveAsByTemplate($"./file/云账户/Payroll Summary_{inDto.YearMonth}(云账户).xlsx", cloudPaymentPath, cloudPaymentInfo); + var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/Payroll Summary_(CloudAccount).xlsx"); + MiniExcel.SaveAsByTemplate($"./file/CloudAccount/Payroll Summary_{inDto.YearMonth}(CloudAccount).xlsx", cloudPaymentPath, cloudPaymentInfo); // 生成summary - var summaryPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payment Summary.xlsx"); + var summaryPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/Payment Summary.xlsx"); var sumData = GetMonthlyPaymentList(new MonthlyPaymentQueryDTO()