fix leave report เพิ่ม leavesubtype แก้ตัวเลขให้แสดงเลขไทย
This commit is contained in:
Suphonchai Phoonsawat
parent
28b573bfb8
commit
d408d875db
1 changed files with 152 additions and 142 deletions
|
|
@ -154,25 +154,26 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile.Oc,
|
||||
leaveDetail = data.LeaveDetail,
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveAddress = data.LeaveAddress,
|
||||
leaveNumber = data.LeaveNumber,
|
||||
LeaveLastStart = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
LeaveLastEnd = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber(),
|
||||
leaveDetail = data.LeaveDetail.ToThaiNumber(),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||
LeaveLastStart = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveLastEnd = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
|
||||
LeaveSummary = sumLeave,
|
||||
LeaveRemain = data.Type.Limit - sumLeave,
|
||||
LeaveSummary = sumLeave.ToString().ToThaiNumber(),
|
||||
LeaveRemain = (data.Type.Limit - sumLeave).ToString().ToThaiNumber(),
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -205,21 +206,22 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
wifeDayName = data.WifeDayName ?? "",
|
||||
wifeDayDateBorn = data.WifeDayDateBorn ?? "",
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveAddress = data.LeaveAddress,
|
||||
leaveNumber = data.LeaveNumber,
|
||||
wifeDayDateBorn = data.WifeDayDateBorn.ToThaiNumber() ?? "",
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -251,26 +253,27 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
restDayOldTotal = data.RestDayOldTotal,
|
||||
restDayCurrentTotal = data.RestDayCurrentTotal,
|
||||
restDayOldTotal = data.RestDayOldTotal.ToString().ToThaiNumber(),
|
||||
restDayCurrentTotal = data.RestDayCurrentTotal.ToString().ToThaiNumber(),
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveAddress = data.LeaveAddress,
|
||||
leaveNumber = data.LeaveNumber,
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||
|
||||
LeaveSummary = sumLeave,
|
||||
LeaveRemain = data.Type.Limit - sumLeave,
|
||||
LeaveSummary = sumLeave.ToString().ToThaiNumber(),
|
||||
LeaveRemain = (data.Type.Limit - sumLeave).ToString().ToThaiNumber(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -302,22 +305,23 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
hajjDayStatus = data.HajjDayStatus,
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -330,28 +334,29 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate(),
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
ordainDayStatus = data.OrdainDayStatus,
|
||||
ordainDayLocationName = data.OrdainDayLocationName,
|
||||
ordainDayLocationAddress = data.OrdainDayLocationAddress,
|
||||
ordainDayLocationNumber = data.OrdainDayLocationNumber,
|
||||
ordainDayOrdination = data.OrdainDayOrdination,
|
||||
ordainDayBuddhistLentName = data.OrdainDayBuddhistLentName,
|
||||
ordainDayBuddhistLentAddress = data.OrdainDayBuddhistLentAddress,
|
||||
ordainDayLocationName = data.OrdainDayLocationName.ToThaiNumber(),
|
||||
ordainDayLocationAddress = data.OrdainDayLocationAddress.ToThaiNumber(),
|
||||
ordainDayLocationNumber = data.OrdainDayLocationNumber.ToThaiNumber(),
|
||||
ordainDayOrdination = data.OrdainDayOrdination.ToThaiShortDate().ToThaiNumber(),
|
||||
ordainDayBuddhistLentName = data.OrdainDayBuddhistLentName.ToThaiNumber(),
|
||||
ordainDayBuddhistLentAddress = data.OrdainDayBuddhistLentAddress.ToThaiNumber(),
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -383,24 +388,25 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
absentDaySummon = data.AbsentDaySummon,
|
||||
absentDayLocation = data.AbsentDayLocation,
|
||||
absentDayRegistorDate = data.AbsentDayRegistorDate.Date.ToThaiShortDate(),
|
||||
absentDayGetIn = data.AbsentDayGetIn,
|
||||
absentDayAt = data.AbsentDayAt,
|
||||
absentDaySummon = data.AbsentDaySummon.ToThaiNumber(),
|
||||
absentDayLocation = data.AbsentDayLocation.ToThaiNumber(),
|
||||
absentDayRegistorDate = data.AbsentDayRegistorDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
absentDayGetIn = data.AbsentDayGetIn.ToThaiNumber(),
|
||||
absentDayAt = data.AbsentDayAt.ToThaiNumber(),
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -431,32 +437,33 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate(),
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
||||
leaveSalary = data.LeaveSalary,
|
||||
leaveSalaryText = data.LeaveSalaryText,
|
||||
studyDaySubject = data.StudyDaySubject ?? "",
|
||||
studyDayDegreeLevel = data.StudyDayDegreeLevel ?? "",
|
||||
studyDayUniversityName = data.StudyDayUniversityName ?? "",
|
||||
studyDayCountry = data.StudyDayCountry ?? "",
|
||||
studyDayScholarship = data.StudyDayScholarship ?? "",
|
||||
studyDayTrainingSubject = data.StudyDayTrainingSubject ?? "",
|
||||
studyDayTrainingName = data.StudyDayTrainingName ?? "",
|
||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveSalary = data.LeaveSalary == null ? "" : data.LeaveSalary.Value.ToNumericText().ToThaiNumber(),
|
||||
leaveSalaryText = data.LeaveSalaryText.ToThaiNumber(),
|
||||
studyDaySubject = data.StudyDaySubject.ToThaiNumber() ?? "",
|
||||
studyDayDegreeLevel = data.StudyDayDegreeLevel.ToThaiNumber() ?? "",
|
||||
studyDayUniversityName = data.StudyDayUniversityName.ToThaiNumber() ?? "",
|
||||
studyDayCountry = data.StudyDayCountry.ToThaiNumber() ?? "",
|
||||
studyDayScholarship = data.StudyDayScholarship.ToThaiNumber() ?? "",
|
||||
studyDayTrainingSubject = data.StudyDayTrainingSubject.ToThaiNumber() ?? "",
|
||||
studyDayTrainingName = data.StudyDayTrainingName.ToThaiNumber() ?? "",
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveAddress = data.LeaveAddress,
|
||||
leaveNumber = data.LeaveNumber,
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -486,18 +493,19 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
fullnameEng = "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
|
||||
}
|
||||
};
|
||||
|
|
@ -528,32 +536,33 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
leaveSalary = data.LeaveSalary,
|
||||
leaveSalaryText = data.LeaveSalaryText,
|
||||
coupleDayName = data.CoupleDayName,
|
||||
coupleDayLevel = data.CoupleDayLevel,
|
||||
coupleDayPosition = data.CoupleDayPosition,
|
||||
leaveSalary = data.LeaveSalary == null ? "" : data.LeaveSalary.Value.ToNumericText().ToThaiNumber(),
|
||||
leaveSalaryText = data.LeaveSalaryText.ToThaiNumber(),
|
||||
coupleDayName = data.CoupleDayName.ToThaiNumber(),
|
||||
coupleDayLevel = data.CoupleDayLevel.ToThaiNumber(),
|
||||
coupleDayPosition = data.CoupleDayPosition.ToThaiNumber(),
|
||||
coupleDayOrganizationName = "-",
|
||||
coupleDayLevelCountry = data.CoupleDayLevelCountry,
|
||||
coupleDayCountryHistory = data.CoupleDayCountryHistory ?? "",
|
||||
coupleDayTotalHistory = data.CoupleDayTotalHistory ?? "",
|
||||
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate(),
|
||||
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate(),
|
||||
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory,
|
||||
coupleDayLevelCountry = data.CoupleDayLevelCountry.ToThaiNumber(),
|
||||
coupleDayCountryHistory = data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
|
||||
coupleDayTotalHistory = data.CoupleDayTotalHistory!.ToThaiNumber() ?? "",
|
||||
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory!.ToThaiNumber(),
|
||||
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
@ -583,20 +592,21 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
reportName = $"leave_form",
|
||||
data = new
|
||||
{
|
||||
leaveWrote = data.LeaveWrote ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
||||
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveTypeName = data.Type.Name,
|
||||
dear = data.Dear,
|
||||
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||
fullname = fullName,
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
||||
organizationName = profile!.Oc ?? "",
|
||||
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||
|
||||
|
||||
|
||||
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue