XCKJ
/
CostCalculationItem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码修复

master
he 2023-12-25 14:12:16 +08:00
parent fabdcc49b9
commit cbe70f5b4a
6 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IRaCIS.Core.API/IRaCIS.Core.API.csproj
View File

@ -68,13 +68,27 @@
<Folder Include="Controllers\ReviewerApi\" /> <Folder Include="Controllers\ReviewerApi\" />
<Folder Include="Properties\PublishProfiles\" /> <Folder Include="Properties\PublishProfiles\" />
<Folder Include="wwwroot\UploadFile\" /> <Folder Include="wwwroot\UploadFile\" />
<Folder Include="wwwroot\Template\" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Update="nlog.config"> <Content Update="nlog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Update="wwwroot\Template\Payment Summary.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Template\Payroll Summary_%28Direct%29.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Template\Payroll Summary_(CloudAccount).xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Template\paystub%28Direct%29.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\Template\paystub(CloudAccount).xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties anonymizetagsetting_1json__JsonSchema="http://json.schemastore.org/jovo-language-model" /></VisualStudio></ProjectExtensions> <ProjectExtensions><VisualStudio><UserProperties anonymizetagsetting_1json__JsonSchema="http://json.schemastore.org/jovo-language-model" /></VisualStudio></ProjectExtensions>

13
IRaCIS.Core.API/appsettings.json
View File

@ -1,5 +1,6 @@
{ {
"ConnectionStrings": { "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;", "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;" "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;" //"RemoteTest": "Server=123.56.181.144,14333\\MSSQLExpress14;Database=IRaCIS_B;User ID=sa;Password=dev123456DEV;"
@ -14,20 +15,20 @@
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"JwtSetting": { "JwtSetting": {
"SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // 密钥 "SecurityKey": "3e6dbfa227234a03977a2f421bdb7f4f", // <EFBFBD><EFBFBD>Կ
"Issuer": "jwtIssuertest1", // 颁发者 "Issuer": "jwtIssuertest1", // <EFBFBD>䷢<EFBFBD><EFBFBD>
"Audience": "jwtAudiencetest1", // 接收者 "Audience": "jwtAudiencetest1", // <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
"TokenExpireDays": "7" // 过期时间（7day） "TokenExpireDays": "7" // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD>䣨7day<EFBFBD><EFBFBD>
}, },
"RootUrl": "http://123.56.181.144:8000", "RootUrl": "http://123.56.181.144:8000",
"CodePrefix": "RE", "CodePrefix": "RE",
"UserCodePrefix": "U", "UserCodePrefix": "U",
"VisitPlanNumPrefix": "VT", "VisitPlanNumPrefix": "VT",
"StoredFilesPath": "D:\\Upload", //该节点没用到 "StoredFilesPath": "D:\\Upload", //<EFBFBD>ýڵ<EFBFBD>û<EFBFBD>õ<EFBFBD>
"DicomFileArchivedPath": "D:\\Upload", // "DicomFileArchivedPath": "D:\\Upload", //
"Share": false, // "Share": false, //
"FileSizeLimit": 1073741824, "FileSizeLimit": 1073741824,
"LoginExpiredTimeSpan": "：15", // Minute "LoginExpiredTimeSpan": "<EFBFBD><EFBFBD>15", // Minute
"OpenLog": true, "OpenLog": true,
"AddClinicalInfo": true, "AddClinicalInfo": true,
"easycaching": { "easycaching": {

0
IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(云账户).xlsx → IRaCIS.Core.API/wwwroot/Template/Payroll Summary_(CloudAccount).xlsx
View File

0
IRaCIS.Core.API/wwwroot/Template/paystub(云账户).xlsx → IRaCIS.Core.API/wwwroot/Template/paystub(CloudAccount).xlsx
View File

2
IRaCIS.Core.Application.Contracts/Financial/DTO/PaymentViewModel.cs
View File

@ -69,7 +69,7 @@ namespace IRaCIS.Application.ViewModels
{ {
get get
{ {
return PaymentMethod == PaymentMethod.CloudPayment ? "云账户" : "Direct"; return PaymentMethod == PaymentMethod.CloudPayment ? "CloudAccount" : "Direct";
} }
} }
} }

20
IRaCIS.Core.Application/Financial/FinancialService.cs
View File

@ -1,4 +1,4 @@
using AutoMapper; using AutoMapper;
using AutoMapper.QueryableExtensions; using AutoMapper.QueryableExtensions;
using IRaCIS.Application.ExpressionExtend; using IRaCIS.Application.ExpressionExtend;
using IRaCIS.Application.Interfaces; using IRaCIS.Application.Interfaces;
@ -1218,9 +1218,9 @@ namespace IRaCIS.Application.Services
System.IO.Directory.CreateDirectory("./file"); 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")) if (!System.IO.Directory.Exists("./file/Direct"))
@ -1251,7 +1251,7 @@ namespace IRaCIS.Application.Services
var deletepaths =new List<string>(){ var deletepaths =new List<string>(){
"./file/Direct","./file/云账户" ,"./file" "./file/Direct","./file/CloudAccount" ,"./file"
}; };
@ -1329,24 +1329,24 @@ namespace IRaCIS.Application.Services
}; };
cloudPaymentInfo.Rows.Add(cloudPaymentSingle); cloudPaymentInfo.Rows.Add(cloudPaymentSingle);
var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\paystub(云账户).xlsx"); var path = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/paystub(CloudAccount).xlsx");
MiniExcel.SaveAsByTemplate($"./file/云账户/{item.ChineseName}_paystub_{inDto.YearMonth}(云账户).xlsx", path, cloudPaymentSingle); MiniExcel.SaveAsByTemplate($"./file/CloudAccount/{item.ChineseName}_paystub_{inDto.YearMonth}(CloudAccount).xlsx", path, cloudPaymentSingle);
} }
remunerationInfo.YearMonth = inDto.YearMonth; remunerationInfo.YearMonth = inDto.YearMonth;
cloudPaymentInfo.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); MiniExcel.SaveAsByTemplate($"./file/Direct/Payroll Summary_{inDto.YearMonth}(Direct).xlsx", remunerationPath, remunerationInfo);
var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot\Template\Payroll Summary_(云账户).xlsx"); var cloudPaymentPath = Path.Combine(Directory.GetCurrentDirectory(), @"wwwroot/Template/Payroll Summary_(CloudAccount).xlsx");
MiniExcel.SaveAsByTemplate($"./file/云账户/Payroll Summary_{inDto.YearMonth}(云账户).xlsx", cloudPaymentPath, cloudPaymentInfo); MiniExcel.SaveAsByTemplate($"./file/CloudAccount/Payroll Summary_{inDto.YearMonth}(CloudAccount).xlsx", cloudPaymentPath, cloudPaymentInfo);
// 生成summary // 生成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() var sumData = GetMonthlyPaymentList(new MonthlyPaymentQueryDTO()