แก้วันที่ในรายงานเป็นเลขไทย
This commit is contained in:
parent
7dd51aa629
commit
a61bc8fc77
1 changed files with 5 additions and 5 deletions
|
|
@ -883,8 +883,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = "LeaveHalfYear-Officer",
|
reportName = "LeaveHalfYear-Officer",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveDateStart = req.StartDate.Date.ToThaiShortDate(),
|
leaveDateStart = req.StartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = req.EndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
organizationName = profile.First().Oc ?? "",
|
organizationName = profile.First().Oc ?? "",
|
||||||
leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
|
leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
|
||||||
employees = employees
|
employees = employees
|
||||||
|
|
@ -1051,8 +1051,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = "LeaveHalfYear-Employee",
|
reportName = "LeaveHalfYear-Employee",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveDateStart = req.StartDate.Date.ToThaiShortDate(),
|
leaveDateStart = req.StartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = req.EndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = req.EndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
organizationName = profile.First().Oc ?? "",
|
organizationName = profile.First().Oc ?? "",
|
||||||
leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
|
leaveTitleType = req.Type == "FULL" ? "หนึ่งปี" : "ครึ่งปี",
|
||||||
employees = employees
|
employees = employees
|
||||||
|
|
@ -1137,7 +1137,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
DateTimeStamp = date.Date.ToThaiFullDate(),
|
DateTimeStamp = date.Date.ToThaiFullDate(),
|
||||||
officerTotal = profile.Count,
|
officerTotal = profile.Count,
|
||||||
workTotal = count - 1,
|
workTotal = (count - 1),
|
||||||
restTotal = 0,
|
restTotal = 0,
|
||||||
sickTotal = 0,
|
sickTotal = 0,
|
||||||
lateTotal = 0,
|
lateTotal = 0,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue