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

Merge branch 'develop' of github.com:Frappet/hrms-api-backend into develop

Browse source
This commit is contained in:
moss 2025-05-07 17:14:07 +07:00
commit ac01435898
3 changed files with 139 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -1299,7 +1299,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
.Include(x => x.Type) .Include(x => x.Type)
//.Where(x => x.LeaveStartDate.Year == year) //.Where(x => x.LeaveStartDate.Year == year)
.Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729 .Where(x => x.LeaveStartDate.Date >= startFiscalDate && x.LeaveStartDate.Date <= endFiscalDate) // fix issue : #729
.Where(x => x.LeaveStatus == "DELETE") .Where(x => x.LeaveStatus == "DELETE" && x.LeaveCancelStatus == "APPROVE")
.ToListAsync(); .ToListAsync();
var res = (from d in data var res = (from d in data

7
BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs
View file

@ -2096,6 +2096,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response> /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpPut("preview/receice/{insigniaNoteId:length(36)}"), DisableRequestSizeLimit] [HttpPut("preview/receice/{insigniaNoteId:length(36)}"), DisableRequestSizeLimit]
public async Task<ActionResult<ResponseObject>> PreviewReceiceProfile([FromForm] ImportFileRequest req, Guid insigniaNoteId) public async Task<ActionResult<ResponseObject>> PreviewReceiceProfile([FromForm] ImportFileRequest req, Guid insigniaNoteId)
{
try
{ {
var getPermission = await _permission.GetPermissionAPIAsync("CREATE", "SYS_INSIGNIA_RECORD"); var getPermission = await _permission.GetPermissionAPIAsync("CREATE", "SYS_INSIGNIA_RECORD");
var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission); var jsonData = JsonConvert.DeserializeObject<JObject>(getPermission);
@ -2228,6 +2230,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
} }
return Success(_insigniaNoteProfiles); return Success(_insigniaNoteProfiles);
} }
catch(Exception ex)
{
return Error(ex);
}
}
/// <summary> /// <summary>
/// preview บันทึกผลใบกำกับเครื่องราชฯ /// preview บันทึกผลใบกำกับเครื่องราชฯ

12
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -1745,7 +1745,7 @@ namespace BMA.EHR.Placement.Service.Controllers
dateStart = r.commandDateAffect, dateStart = r.commandDateAffect,
govAgeAbsent = 0, govAgeAbsent = 0,
govAgePlus = 0, govAgePlus = 0,
birthDate = p.DateOfBirth == null ? (DateTime?)null : p.DateOfBirth, birthDate = (p.DateOfBirth == null || p.DateOfBirth == DateTime.MinValue) ? (DateTime?)null : p.DateOfBirth,
reasonSameDate = (DateTime?)null, reasonSameDate = (DateTime?)null,
ethnicity = p.Race == null ? string.Empty : p.Race, ethnicity = p.Race == null ? string.Empty : p.Race,
telephoneNumber = p.Telephone == null ? string.Empty : Regex.Replace(p.Telephone, @"\D", ""), telephoneNumber = p.Telephone == null ? string.Empty : Regex.Replace(p.Telephone, @"\D", ""),
@ -1775,13 +1775,13 @@ namespace BMA.EHR.Placement.Service.Controllers
duration = e.Duration ?? string.Empty, duration = e.Duration ?? string.Empty,
durationYear = e.DurationYear ?? null, durationYear = e.DurationYear ?? null,
field = e.Field ?? string.Empty, field = e.Field ?? string.Empty,
finishDate = e.FinishDate ?? null, finishDate = (e.FinishDate == null || e.FinishDate == DateTime.MinValue) ? (DateTime?)null : e.FinishDate,
fundName = e.FundName ?? string.Empty, fundName = e.FundName ?? string.Empty,
gpa = e.Gpa ?? string.Empty, gpa = e.Gpa ?? string.Empty,
institute = e.Institute ?? string.Empty, institute = e.Institute ?? string.Empty,
other = e.Other ?? string.Empty, other = e.Other ?? string.Empty,
startDate = e.StartDate ?? null, startDate = (e.StartDate == null || e.StartDate == DateTime.MinValue) ? (DateTime?)null : e.StartDate,
endDate = e.EndDate ?? null, endDate = (e.EndDate == null || e.EndDate == DateTime.MinValue) ? (DateTime?)null : e.EndDate,
educationLevel = e.EducationLevelName, educationLevel = e.EducationLevelName,
educationLevelId = e.EducationLevelId, educationLevelId = e.EducationLevelId,
positionPath = e.PositionPath?.Name ?? string.Empty, positionPath = e.PositionPath?.Name ?? string.Empty,
@ -1793,8 +1793,8 @@ namespace BMA.EHR.Placement.Service.Controllers
bodyCertificates = p.PlacementCertificates.Select(e => new bodyCertificates = p.PlacementCertificates.Select(e => new
{ {
profileId = string.Empty, profileId = string.Empty,
expireDate = e.ExpireDate ?? null, expireDate = (e.ExpireDate == null || e.ExpireDate == DateTime.MinValue) ? (DateTime?)null : e.ExpireDate,
issueDate = e.IssueDate ?? null, issueDate = (e.IssueDate == null || e.IssueDate == DateTime.MinValue) ? (DateTime?)null : e.IssueDate,
certificateNo = e.CertificateNo ?? string.Empty, certificateNo = e.CertificateNo ?? string.Empty,
certificateType = e.CertificateType ?? string.Empty, certificateType = e.CertificateType ?? string.Empty,
issuer = e.Issuer ?? string.Empty issuer = e.Issuer ?? string.Empty