Merge branch 'develop'
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
This commit is contained in:
commit
9becd892f5
1 changed files with 5 additions and 5 deletions
|
|
@ -690,11 +690,11 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
coupleDayPosition = data.CoupleDayPosition.ToThaiNumber(),
|
coupleDayPosition = data.CoupleDayPosition.ToThaiNumber(),
|
||||||
coupleDayOrganizationName = "-",
|
coupleDayOrganizationName = "-",
|
||||||
coupleDayLevelCountry = data.CoupleDayLevelCountry.ToThaiNumber(),
|
coupleDayLevelCountry = data.CoupleDayLevelCountry.ToThaiNumber(),
|
||||||
coupleDayCountryHistory = data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
|
coupleDayCountryHistory = data.CoupleDayCountryHistory == null ? "-" : data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
|
||||||
coupleDayTotalHistory = data.CoupleDayTotalHistory!.ToThaiNumber() ?? "",
|
coupleDayTotalHistory = data.CoupleDayTotalHistory == null ? "-" : data.CoupleDayTotalHistory!.ToThaiNumber(),
|
||||||
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "-" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "-" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory!.ToThaiNumber(),
|
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory == null ? "-" : data.CoupleDaySumTotalHistory!.ToThaiNumber(),
|
||||||
|
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue