hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ไขใบเสร็จใบกำกับเครื่องราช

Browse source
This commit is contained in:
Kittapath 2023-09-19 19:33:02 +07:00
parent 48ace11503
commit c3cc2d0b94
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
BMA.EHR.Application/Repositories/Reports/RetireReportRepository.cs
View file

@ -136,17 +136,17 @@ namespace BMA.EHR.Application.Repositories.Reports
remove = x.Remove, remove = x.Remove,
profileId = x.Profile.Id, profileId = x.Profile.Id,
citizenId = x.Profile.CitizenId, citizenId = x.Profile.CitizenId,
prefix = x.Profile.Prefix == null ? string.Empty : x.Profile.Prefix.Name, prefix = x.Profile.Prefix == null ? "" : x.Profile.Prefix.Name,
fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}", fullName = $"{(x.Profile.Prefix == null ? null : x.Profile.Prefix.Name)}{x.Profile.FirstName} {x.Profile.LastName}",
organizationOrganization = x.Profile.OrganizationOrganization, organizationOrganization = x.Profile.OrganizationOrganization,
ocId = x.Profile.OcId, ocId = x.Profile.OcId,
position = x.Profile.Position == null ? string.Empty : x.Profile.Position.Name, position = x.Profile.Position == null ? "-" : x.Profile.Position.Name,
positionType = x.Profile.PositionType == null ? string.Empty : x.Profile.PositionType.Name, positionType = x.Profile.PositionType == null ? "-" : x.Profile.PositionType.Name,
positionExecutive = x.Profile.PositionExecutive, positionExecutive = x.Profile.PositionExecutive,
posNo = x.Profile.PosNo == null ? string.Empty : x.Profile.PosNo.Name, posNo = x.Profile.PosNo == null ? "-" : x.Profile.PosNo.Name,
positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? null : x.Profile.PositionEmployeePosition.Name, positionEmployeePosition = x.Profile.PositionEmployeePosition == null ? "-" : x.Profile.PositionEmployeePosition.Name,
positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? null : x.Profile.PositionEmployeeLevel.Name, positionEmployeeLevel = x.Profile.PositionEmployeeLevel == null ? "-" : x.Profile.PositionEmployeeLevel.Name,
positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? null : x.Profile.PositionEmployeeGroup.Name, positionEmployeeGroup = x.Profile.PositionEmployeeGroup == null ? "-" : x.Profile.PositionEmployeeGroup.Name,
posNoEmployee = x.Profile.PosNoEmployee, posNoEmployee = x.Profile.PosNoEmployee,
}) })
.ToListAsync(); .ToListAsync();

12
BMA.EHR.Insignia.Service/Controllers/InsigniaRequestController.cs
View file

@ -124,7 +124,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
ret = oc + "/" + ret; ret = oc + "/" + ret;
} }
ret = ret.Substring(0, ret.Length - 1); if (ret.Length > 2)
ret = ret.Substring(0, ret.Length - 1);
return ret; return ret;
} }
@ -1462,6 +1463,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
} }
else else
{ {
profileInsignia.DatePayment = req.DatePayment;
profileInsignia.TypePayment = req.TypePayment;
profileInsignia.Address = req.Address;
if (profileInsignia.Status != "DONE") if (profileInsignia.Status != "DONE")
{ {
profileInsignia.Issue = req.Issue; profileInsignia.Issue = req.Issue;
@ -1472,9 +1476,9 @@ namespace BMA.EHR.Insignia.Service.Controllers
profileInsignia.Section = req.Section; profileInsignia.Section = req.Section;
profileInsignia.Page = req.Page; profileInsignia.Page = req.Page;
profileInsignia.No = req.No; profileInsignia.No = req.No;
profileInsignia.DatePayment = req.DatePayment; // profileInsignia.DatePayment = req.DatePayment;
profileInsignia.TypePayment = req.TypePayment; // profileInsignia.TypePayment = req.TypePayment;
profileInsignia.Address = req.Address; // profileInsignia.Address = req.Address;
profileInsignia.RequestInsignia = insignia; profileInsignia.RequestInsignia = insignia;
profileInsignia.LastUpdateFullName = FullName ?? "System Administrator"; profileInsignia.LastUpdateFullName = FullName ?? "System Administrator";
profileInsignia.LastUpdateUserId = UserId ?? ""; profileInsignia.LastUpdateUserId = UserId ?? "";

3
BMA.EHR.Retirement.Service/Controllers/RetirementResignController.cs
View file

@ -95,7 +95,8 @@ namespace BMA.EHR.Retirement.Service.Controllers
ret = oc + "/" + ret; ret = oc + "/" + ret;
} }
ret = ret.Substring(0, ret.Length - 1); if (ret.Length > 2)
ret = ret.Substring(0, ret.Length - 1);
return ret; return ret;
} }