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

Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop
Some checks failed
release-dev / release-dev (push) Failing after 12s
Details

Browse source
This commit is contained in:
kittapath 2024-12-24 13:35:18 +07:00
commit 00e8424329
2 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1034,12 +1034,12 @@ namespace BMA.EHR.Leave.Service.Controllers
if (timeStamps.CheckOut != null) if (timeStamps.CheckOut != null)
{ {
if (timeStamps.CheckOutStatus == "ABSENT") if (timeStamps.CheckOutStatus == "ABSENT")
remarkStr = "ขาดราชการ"; remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckOut ? $" (นอกสถานที่:{ timeStamps.CheckOutLocationName })".Trim() : "") ;
else if (timeStamps.CheckInStatus == "ABSENT") else if (timeStamps.CheckInStatus == "ABSENT")
remarkStr = "ขาดราชการ"; remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
else if (timeStamps.CheckInStatus == "LATE") else if (timeStamps.CheckInStatus == "LATE")
{ {
remarkStr = "สาย"; remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
lateTotal += 1; lateTotal += 1;
} }
else else
@ -1048,10 +1048,10 @@ namespace BMA.EHR.Leave.Service.Controllers
else else
{ {
if (timeStamps.CheckInStatus == "ABSENT") if (timeStamps.CheckInStatus == "ABSENT")
remarkStr = "ขาดราชการ"; remarkStr = "ขาดราชการ" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
else if (timeStamps.CheckInStatus == "LATE") else if (timeStamps.CheckInStatus == "LATE")
{ {
remarkStr = "สาย"; remarkStr = "สาย" + (!timeStamps.IsLocationCheckIn ? $" (นอกสถานที่:{timeStamps.CheckInLocationName})".Trim() : "");
lateTotal += 1; lateTotal += 1;
} }
else else

44
BMA.EHR.Placement.Service/Controllers/PlacementController.cs
View file

@ -2785,5 +2785,49 @@ namespace BMA.EHR.Placement.Service.Controllers
} }
return Success(); return Success();
} }
/// <summary>
/// report1
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report1")]
public async Task<ActionResult<ResponseObject>> report1(string? nodeId = null, int? node = 0, DateOnly? startDate = null, DateOnly? startEnd = null)
{
var data = new
{
template = "placement01",
reportName = "xlsx-report",
data = ""
};
return Success(data);
}
/// <summary>
/// report2
/// </summary>
/// <returns></returns>
/// <response code="200"></response>
/// <response code="400">ค่าตัวแปรที่ส่งมาไม่ถูกต้อง</response>
/// <response code="401">ไม่ได้ Login เข้าระบบ</response>
/// <response code="500">เมื่อเกิดข้อผิดพลาดในการทำงาน</response>
[HttpGet("report2")]
public async Task<ActionResult<ResponseObject>> report2(string? nodeId = null, int? node = 0, DateOnly? startDate = null, DateOnly? startEnd = null)
{
var data = new
{
template = "placement02",
reportName = "xlsx-report",
data = ""
};
return Success(data);
}
} }
} }