fix : Leave ==> WFH and Seminar Count
Insignia ==> รายชื่อหน่วยงานที่ยังไม่ส่งรายชื่อ
This commit is contained in:
parent
759d98be61
commit
bba2fcf2a9
3 changed files with 14 additions and 2 deletions
|
|
@ -971,7 +971,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
||||||
return Error(GlobalMessages.InsigniaRequestNotFound);
|
return Error(GlobalMessages.InsigniaRequestNotFound);
|
||||||
var orgIdSend = await _context.InsigniaRequests
|
var orgIdSend = await _context.InsigniaRequests
|
||||||
.Where(x => x.Period == insigniaPeriod)
|
.Where(x => x.Period == insigniaPeriod)
|
||||||
.Where(x => x.RequestStatus == "st1")
|
.Where(x => x.RequestStatus == "st6")
|
||||||
.Select(x => x.OrganizationId)
|
.Select(x => x.OrganizationId)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2038,6 +2038,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region " รายการลารายบุคคล "
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// LV1_026 - รายการลารายบุคคล (ADMIN)
|
/// LV1_026 - รายการลารายบุคคล (ADMIN)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
@ -2103,5 +2105,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1085,6 +1085,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
var wfhTotal = 0;
|
var wfhTotal = 0;
|
||||||
var studyTotal = 0;
|
var studyTotal = 0;
|
||||||
var workTotal = 0;
|
var workTotal = 0;
|
||||||
|
var seminarTotal = 0;
|
||||||
|
|
||||||
|
|
||||||
foreach (var dd in dateList)
|
foreach (var dd in dateList)
|
||||||
|
|
@ -1204,7 +1205,13 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
workTotal += 1;
|
workTotal += 1;
|
||||||
if (!timeStamps.IsLocationCheckIn)
|
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,
|
sickTotal = sickTotal,
|
||||||
lateTotal = lateTotal,
|
lateTotal = lateTotal,
|
||||||
wfhTotal = wfhTotal,
|
wfhTotal = wfhTotal,
|
||||||
|
seminarTotal = seminarTotal,
|
||||||
studyTotal = studyTotal,
|
studyTotal = studyTotal,
|
||||||
employees = employees
|
employees = employees
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue