กทม. ต้องการพิ่มรายการลงเวลานอกสถานะที่ "ปฏิบัติงานในจุดบริการด่วนมหานคร" กำหนดเวลา 10.30-18.30 น. #2458
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m41s
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m41s
This commit is contained in:
parent
aed1e8a58d
commit
2bdb8bb733
1 changed files with 26 additions and 0 deletions
|
|
@ -1086,6 +1086,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
startTime1 = "13:00";
|
||||
endTime1 = "14:30";
|
||||
endTimeMorning1 = "12:00";
|
||||
}
|
||||
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||
{
|
||||
startTime1 = "13:00";
|
||||
endTime1 = "18:30";
|
||||
endTimeMorning1 = "12:00";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -1252,6 +1258,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
var startTime = "";
|
||||
var endTime = "";
|
||||
if (!data.IsLocation && data.LocationName == "ไปประชุม / อบรม / สัมมนา")
|
||||
{
|
||||
//startTime = "09:30";
|
||||
startTime = "10:30";
|
||||
endTime = "12:00";
|
||||
}
|
||||
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||
{
|
||||
//startTime = "09:30";
|
||||
startTime = "10:30";
|
||||
|
|
@ -1403,6 +1415,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
startTime = "13:00";
|
||||
endTime = "14:30";
|
||||
endTimeMorning = "12:00";
|
||||
}
|
||||
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||
{
|
||||
startTime = "13:00";
|
||||
endTime = "18:30";
|
||||
endTimeMorning = "12:00";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -4130,6 +4148,10 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
if (req.CheckInStatus == "NORMAL")
|
||||
{
|
||||
if(data.CheckInLocationName == "ไปประชุม / อบรม / สัมมนา")
|
||||
{
|
||||
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
|
||||
}
|
||||
else if (data.CheckInLocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||
{
|
||||
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
|
||||
}
|
||||
|
|
@ -4147,6 +4169,10 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
if(data.CheckOutLocationName == "ไปประชุม / อบรม / สัมมนา")
|
||||
{
|
||||
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 14:30");
|
||||
}
|
||||
else if (data.CheckInLocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||
{
|
||||
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 18:30");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue