From 3beba561fc2a88c0316466aa1ed202a0f1939f66 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 16 May 2025 10:33:38 +0700 Subject: [PATCH] =?UTF-8?q?fix=20#1547=20****=20=E0=B8=A3=E0=B8=AD?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=99=20migration=20=E0=B8=AD=E0=B8=B5?= =?UTF-8?q?=E0=B8=81=E0=B8=84=E0=B8=A3=E0=B8=B1=E0=B9=89=E0=B8=87=20*****?= =?UTF-8?q?=20fix=20#1520?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeaveRequests/LeaveRequestRepository.cs | 2 +- .../TimeAttendants/AdditionalCheckRequest.cs | 9 ++++++++ BMA.EHR.Leave/Controllers/LeaveController.cs | 22 +++++++++++++++++-- .../CreateAdditionalCheckRequestDto.cs | 6 +++++ .../GetAdditionalCheckRequestDto.cs | 6 +++++ 5 files changed, 42 insertions(+), 3 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs index 68933211..336bdeac 100644 --- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs +++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs @@ -498,7 +498,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests { var rawData = _dbContext.Set().AsNoTracking() .Include(x => x.Type) - .Where(x => x.LeaveStatus == "DELETE") + .Where(x => x.LeaveStatus == "DELETE" || x.LeaveStatus == "DELETING") .AsQueryable(); if (year != 0) diff --git a/BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs b/BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs index df5452e3..d5ff5b52 100644 --- a/BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs +++ b/BMA.EHR.Domain/Models/Leave/TimeAttendants/AdditionalCheckRequest.cs @@ -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; + + } } diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index c6f1db85..73c632b4 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -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; } diff --git a/BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs b/BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs index a242cf81..7b2a2084 100644 --- a/BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs +++ b/BMA.EHR.Leave/DTOs/AdditionalCheck/CreateAdditionalCheckRequestDto.cs @@ -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; } } diff --git a/BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs b/BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs index 75cd6cb7..8c04223d 100644 --- a/BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs +++ b/BMA.EHR.Leave/DTOs/AdditionalCheck/GetAdditionalCheckRequestDto.cs @@ -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; } }