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-10-17 12:39:36 +07:00
parent 862408b289
commit 9379e1b421
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
BMA.EHR.Application/Repositories/Reports/CandidateReportRepository.cs
View file

@ -59,7 +59,6 @@ namespace BMA.EHR.Application.Repositories.Reports
var monthDiff = 0; var monthDiff = 0;
var dayDiff = 0; var dayDiff = 0;
var sb = new StringBuilder(); var sb = new StringBuilder();
var zxc = new List<dynamic>();
foreach (var career in careers) foreach (var career in careers)
{ {
if (career.DurationEnd < career.DurationStart) if (career.DurationEnd < career.DurationStart)
@ -68,7 +67,6 @@ namespace BMA.EHR.Application.Repositories.Reports
yearDiff = yearDiff + rangeObj.years; yearDiff = yearDiff + rangeObj.years;
monthDiff = monthDiff + rangeObj.months; monthDiff = monthDiff + rangeObj.months;
dayDiff = dayDiff + rangeObj.days; dayDiff = dayDiff + rangeObj.days;
zxc.Add(rangeObj);
} }
else else
{ {
@ -76,7 +74,6 @@ namespace BMA.EHR.Application.Repositories.Reports
yearDiff = yearDiff + rangeObj.years; yearDiff = yearDiff + rangeObj.years;
monthDiff = monthDiff + rangeObj.months; monthDiff = monthDiff + rangeObj.months;
dayDiff = dayDiff + rangeObj.days; dayDiff = dayDiff + rangeObj.days;
zxc.Add(rangeObj);
} }
if (dayDiff >= 30) if (dayDiff >= 30)
{ {

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

@ -2208,7 +2208,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
/// <response code="401">ไม่ได้ Login เข้าระบบ</response> /// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response> /// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpPut("download/excel/{RequestId:length(36)}")] [HttpPut("download/excel/{RequestId:length(36)}")]
public async Task<ActionResult<ResponseObject>> DownloadExcelInsigniaByFilter([FromForm] ExportFileInsigniaRequest req, Guid RequestId) public async Task<ActionResult<ResponseObject>> DownloadExcelInsigniaByFilter([FromBody] ExportFileInsigniaRequest req, Guid RequestId)
{ {
var insigniaPeriod = await _context.InsigniaRequests var insigniaPeriod = await _context.InsigniaRequests
.Include(x => x.Organization) .Include(x => x.Organization)
@ -2230,6 +2230,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
.ThenInclude(x => x.Profile) .ThenInclude(x => x.Profile)
.ThenInclude(x => x.Insignias) .ThenInclude(x => x.Insignias)
.ThenInclude(x => x.Insignia) .ThenInclude(x => x.Insignia)
.Include(x => x.RequestProfiles)
.ThenInclude(x => x.RequestInsignia)
.FirstOrDefaultAsync(x => x.Id == RequestId); .FirstOrDefaultAsync(x => x.Id == RequestId);
if (insigniaPeriod == null) if (insigniaPeriod == null)
return Error(GlobalMessages.InsigniaPeriodNotFound); return Error(GlobalMessages.InsigniaPeriodNotFound);
@ -2251,7 +2253,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
var workSheet = excel.Workbook.Worksheets[0]; var workSheet = excel.Workbook.Worksheets[0];
var requestProfiles = insigniaPeriod.RequestProfiles.Where(x => x.Status == "PENDING").ToList(); var requestProfiles = insigniaPeriod.RequestProfiles.Where(x => x.Status == "PENDING").ToList();
if (req.ProfileType != null) if (req.ProfileType != null)
requestProfiles = requestProfiles.Where(x => x.Profile.ProfileType == req.ProfileType.Trim().ToUpper()).ToList(); requestProfiles = requestProfiles.Where(x => x.Profile != null).Where(x => x.Profile.ProfileType.Trim().ToUpper() == req.ProfileType.Trim().ToUpper()).ToList();
if (req.InsigniaId != null) if (req.InsigniaId != null)
requestProfiles = requestProfiles.Where(x => x.RequestInsignia.Id == req.InsigniaId).ToList(); requestProfiles = requestProfiles.Where(x => x.RequestInsignia.Id == req.InsigniaId).ToList();
// if (req.OrgId != null) // if (req.OrgId != null)