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

fix : Leave ==> WFH and Seminar Count

Browse source 
Insignia ==> รายชื่อหน่วยงานที่ยังไม่ส่งรายชื่อ
This commit is contained in:
Suphonchai Phoonsawat 2024-08-30 11:12:45 +07:00
parent 759d98be61
commit bba2fcf2a9
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -971,7 +971,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
return Error(GlobalMessages.InsigniaRequestNotFound);
var orgIdSend = await _context.InsigniaRequests
.Where(x => x.Period == insigniaPeriod)
.Where(x => x.RequestStatus == "st1")
.Where(x => x.RequestStatus == "st6")
.Select(x => x.OrganizationId)
.ToListAsync();

4
BMA.EHR.Leave/Controllers/LeaveController.cs
View file

@ -2038,6 +2038,8 @@ namespace BMA.EHR.Leave.Service.Controllers
#endregion
#region " รายการลารายบุคคล "
/// <summary>
/// LV1_026 - รายการลารายบุคคล (ADMIN)
/// </summary>
@ -2103,5 +2105,7 @@ namespace BMA.EHR.Leave.Service.Controllers
#endregion
#endregion
}
}

10
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -1085,6 +1085,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var wfhTotal = 0;
var studyTotal = 0;
var workTotal = 0;
var seminarTotal = 0;
foreach (var dd in dateList)
@ -1204,7 +1205,13 @@ namespace BMA.EHR.Leave.Service.Controllers
{
workTotal += 1;
if (!timeStamps.IsLocationCheckIn)
wfhTotal += 1;
{
if(timeStamps.CheckInLocationName!.Contains("ปฏิบัติงานที่บ้าน"))
wfhTotal += 1;
else if (timeStamps.CheckInLocationName!.Contains("ประชุม"))
seminarTotal += 1;
}
}
@ -1260,6 +1267,7 @@ namespace BMA.EHR.Leave.Service.Controllers
sickTotal = sickTotal,
lateTotal = lateTotal,
wfhTotal = wfhTotal,
seminarTotal = seminarTotal,
studyTotal = studyTotal,
employees = employees
};