กทม. ต้องการพิ่มรายการลงเวลานอกสถานะที่ "ปฏิบัติงานในจุดบริการด่วนมหานคร" กำหนดเวลา 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
|
|
@ -1087,6 +1087,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
endTime1 = "14:30";
|
endTime1 = "14:30";
|
||||||
endTimeMorning1 = "12:00";
|
endTimeMorning1 = "12:00";
|
||||||
}
|
}
|
||||||
|
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||||
|
{
|
||||||
|
startTime1 = "13:00";
|
||||||
|
endTime1 = "18:30";
|
||||||
|
endTimeMorning1 = "12:00";
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
endTime1 = duty.EndTimeAfternoon;
|
endTime1 = duty.EndTimeAfternoon;
|
||||||
|
|
@ -1257,6 +1263,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
startTime = "10:30";
|
startTime = "10:30";
|
||||||
endTime = "12:00";
|
endTime = "12:00";
|
||||||
}
|
}
|
||||||
|
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||||
|
{
|
||||||
|
//startTime = "09:30";
|
||||||
|
startTime = "10:30";
|
||||||
|
endTime = "12:00";
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
startTime = duty.StartTimeMorning;
|
startTime = duty.StartTimeMorning;
|
||||||
|
|
@ -1404,6 +1416,12 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
endTime = "14:30";
|
endTime = "14:30";
|
||||||
endTimeMorning = "12:00";
|
endTimeMorning = "12:00";
|
||||||
}
|
}
|
||||||
|
else if (!data.IsLocation && data.LocationName == "ปฏิบัติงานในจุดบริการด่วนมหานคร")
|
||||||
|
{
|
||||||
|
startTime = "13:00";
|
||||||
|
endTime = "18:30";
|
||||||
|
endTimeMorning = "12:00";
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
endTime = duty.EndTimeAfternoon;
|
endTime = duty.EndTimeAfternoon;
|
||||||
|
|
@ -4133,6 +4151,10 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} 10:30");
|
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");
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
|
data.CheckIn = DateTime.Parse($"{data.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
|
||||||
|
|
@ -4148,6 +4170,10 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} 14:30");
|
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
|
else
|
||||||
{
|
{
|
||||||
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
|
roundCheckOutTime = DateTime.Parse($"{checkOutTime.Date.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue