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

report leave sort
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
kittapath 2025-03-07 23:30:43 +07:00
parent 4487214e95
commit 3b95c4d2d1
2 changed files with 64 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,22 @@ namespace BMA.EHR.Leave.Service.Controllers
public bool isHoliday { get; set; }
}
private class DateResultReport
{
public int no { get; set; }
public string fullName { get; set; }
public string dutyTimeName { get; set; }
public string checkInLocation { get; set; }
public string checkInTime { get; set; }
public string checkOutLocation { get; set; }
public string checkOutTime { get; set; }
public string remark { get; set; }
public string checkInDate { get; set; }
public string checkedOutDate { get; set; }
public DateTime? checkInTimeRaw { get; set; }
public DateTime? checkOutTimeRaw { get; set; }
}
#endregion
@ -1159,7 +1175,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var dateList = new List<LoopDate>();
for (DateTime i = req.StartDate.Date; i <= req.EndDate.Date; i = i.AddDays(1))
{
if (!excludeDates.Contains(i))
if (excludeDates.Contains(i))
{
dateList.Add(new LoopDate
{
@ -1172,12 +1188,12 @@ namespace BMA.EHR.Leave.Service.Controllers
dateList.Add(new LoopDate
{
date = i,
isHoliday = true,
isHoliday = false,
});
}
}
var employees = new List<dynamic>();
var employees = new List<DateResultReport>();
var count = 1;
var restTotal = 0;
@ -1278,7 +1294,7 @@ namespace BMA.EHR.Leave.Service.Controllers
}
}
var emp = new
var emp = new DateResultReport
{
no = count,
fullName = fullName,
@ -1291,12 +1307,13 @@ namespace BMA.EHR.Leave.Service.Controllers
$"{timeStamps.CheckOut.Value.ToString("HH:mm")} น." :
"",
remark = remarkStr,
date = timeStamps == null ? dd.date.Date : timeStamps.CheckIn.Date,
checkInDate = timeStamps == null ? dd.date.Date.ToThaiFullDate2() : timeStamps.CheckIn.Date.ToThaiFullDate2(),
checkedOutDate = timeStamps == null ? dd.date.Date.ToThaiFullDate2() :
timeStamps.CheckOut != null ?
timeStamps.CheckOut.Value.ToThaiFullDate2() :
"",
checkInTimeRaw = timeStamps?.CheckIn,
checkOutTimeRaw = timeStamps?.CheckOut,
};
if (timeStamps != null)
@ -1332,6 +1349,11 @@ namespace BMA.EHR.Leave.Service.Controllers
count++;
}
}
employees = employees.OrderBy(x => x.checkInTimeRaw ?? DateTime.MaxValue).ThenBy(x => x.checkOutTimeRaw ?? DateTime.MaxValue).ToList();
for (int i = 0; i < employees.Count; i++)
{
employees[i].no = i + 1;
}
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate()}";
var item = new
@ -1346,7 +1368,7 @@ namespace BMA.EHR.Leave.Service.Controllers
wfhTotal = wfhTotal,
seminarTotal = seminarTotal,
studyTotal = studyTotal,
employees = employees.OrderBy(x => x.date).ToList()
employees = employees
};
//วันที่ออก
var result = new