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

fix report

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-01-19 08:47:46 +07:00
parent 78b0ad7d1d
commit 9b81e22599
4 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1116,7 +1116,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{
no = count,
fullName = fullName,
dutyTimeName = $"{duty.StartTimeMorning} น.",
dutyTimeName = $"{duty.StartTimeMorning} - {duty.EndTimeAfternoon} น.",
checkInLocation = timeStamps == null ? "" : timeStamps.CheckInPOI,
checkInTime = timeStamps == null ? "" : $"{timeStamps.CheckIn.ToString("HH:mm")} น.",
@ -1126,7 +1126,13 @@ namespace BMA.EHR.Leave.Service.Controllers
$"{timeStamps.CheckOut.Value.ToString("HH:mm")} น." :
"",
remark = ""
remark = timeStamps == null ? "ขาดราชการ" : "",
checkInDate = timeStamps == null ? "" : timeStamps.CheckIn.Date.ToThaiFullDate2().ToThaiNumber(),
checkedOutDate = timeStamps == null ? "" :
timeStamps.CheckOut != null ?
timeStamps.CheckOut.Value.ToThaiFullDate2().ToThaiNumber() :
"",
};
employees.Add(emp);

4
BMA.EHR.Leave.Service/Controllers/LeaveRequestController.cs
View file

@ -894,7 +894,7 @@ namespace BMA.EHR.Leave.Service.Controllers
LeaveLastEnd = lastLeaveRequest == null ? null : lastLeaveRequest.LeaveEndDate,
//LeaveTotal = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate),
LeaveTotal = sumLeave - (sumWeekend + sumHoliday),
LeaveTotal = rawData.LeaveTotal,
LeaveBirthDate = profile.BirthDate,
@ -1401,7 +1401,7 @@ namespace BMA.EHR.Leave.Service.Controllers
//LeaveTotal = rawData.LeaveStartDate.DiffDay(rawData.LeaveEndDate),
LeaveTotal = sumLeave - (sumHoliday + sumWeekend),
LeaveTotal = rawData.LeaveTotal,
LeaveBirthDate = profile.BirthDate,
LeaveGovernmentDate = profile.DateAppoint == null ? null : profile.DateAppoint.Value,

2
BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs
View file

@ -39,7 +39,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public DateTime? LeaveLastEnd { get; set; } = DateTime.MinValue;
public float LeaveTotal { get; set; } = 0;
public double LeaveTotal { get; set; } = 0;
public DateTime? LeaveBirthDate { get; set; } = DateTime.MinValue;

2
BMA.EHR.Leave.Service/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs
View file

@ -46,7 +46,7 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public DateTime? LeaveLastEnd { get; set; } = DateTime.MinValue;
public float LeaveTotal { get; set; } = 0;
public double LeaveTotal { get; set; } = 0;
public DateTime? LeaveBirthDate { get; set; } = DateTime.MinValue;