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

fix #1547 **** รอรัน migration อีกครั้ง *****

Browse source 
fix #1520
This commit is contained in:
Suphonchai Phoonsawat 2025-05-16 10:33:38 +07:00
parent 6e1965ba79
commit 3beba561fc
5 changed files with 42 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -498,7 +498,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
{
var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
.Include(x => x.Type)
.Where(x => x.LeaveStatus == "DELETE")
.Where(x => x.LeaveStatus == "DELETE" || x.LeaveStatus == "DELETING")
.AsQueryable();
if (year != 0)

9
BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs
View file

@ -32,5 +32,14 @@ namespace BMA.EHR.Domain.Models.Leave.TimeAttendants
public string? FirstName { get; set; }
public string? LastName { get; set; }
public string? POI { get; set; } = string.Empty;
public double? Latitude { get; set; } = 0.0;
public double? Longitude { get; set; } = 0.0;
}
}

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

@ -1859,6 +1859,11 @@ namespace BMA.EHR.Leave.Service.Controllers
Prefix = profile.Prefix,
FirstName = profile.FirstName,
LastName = profile.LastName,
// fix issue #1547
POI = req.POI,
Latitude = req.Latitude,
Longitude = req.Longitude,
};
await _additionalCheckRequestRepository.AddAsync(request);
@ -1963,6 +1968,11 @@ namespace BMA.EHR.Leave.Service.Controllers
StatusSort = data.Status.Trim().ToLower() == "pending" ? 1 :
data.Status.Trim().ToLower() == "approve" ? 2 : 3,
POI = data.POI,
Latitude = data.Latitude,
Longitude = data.Longitude,
};
result.Add(resObj);
@ -2036,8 +2046,8 @@ namespace BMA.EHR.Leave.Service.Controllers
CheckInLon = 0,
CheckOutLat = 0,
CheckOutLon = 0,
CheckInPOI = "ลงเวลากรณีพิเศษ",
CheckOutPOI = "ลงเวลากรณีพิเศษ",
CheckInPOI = "",
CheckOutPOI = "",
CheckInStatus = req.CheckInStatus,
CheckOutStatus = req.CheckOutStatus,
@ -2079,6 +2089,10 @@ namespace BMA.EHR.Leave.Service.Controllers
processTimeStamp.CheckInLon = 0;
processTimeStamp.CheckInPOI = "ลงเวลากรณีพิเศษ";
processTimeStamp.CheckInStatus = req.CheckInStatus;
processTimeStamp.CheckInPOI = requestData.POI ?? "";
processTimeStamp.CheckInLat = requestData.Latitude ?? 0;
processTimeStamp.CheckInLon = requestData.Longitude ?? 0;
}
if (requestData.CheckOutEdit)
@ -2089,6 +2103,10 @@ namespace BMA.EHR.Leave.Service.Controllers
processTimeStamp.CheckOutLon = 0;
processTimeStamp.CheckOutPOI = "ลงเวลากรณีพิเศษ";
processTimeStamp.CheckOutStatus = req.CheckOutStatus;
processTimeStamp.CheckOutPOI = requestData.POI ?? "";
processTimeStamp.CheckOutLat = requestData.Latitude ?? 0;
processTimeStamp.CheckOutLon = requestData.Longitude ?? 0;
}

6
BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs
View file

@ -9,5 +9,11 @@
public bool CheckOutEdit { get; set;}
public string Description { get; set; }
public string? POI { get; set; } = string.Empty;
public double? Latitude { get; set; } = 0.0;
public double? Longitude { get; set; } = 0.0;
}
}

6
BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs
View file

@ -37,5 +37,11 @@
public string Description { get; set; }
public int StatusSort { get; set; } = 0;
public string? POI { get; set; } = string.Empty;
public double? Latitude { get; set; } = 0.0;
public double? Longitude { get; set; } = 0.0;
}
}