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

Browse source
This commit is contained in:
Kittapath 2023-12-06 23:43:43 +07:00
commit 0b4ea7c9ce
20 changed files with 4752 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

20
BMA.EHR.Domain/Models/Leave/Requests/LeaveRequest.cs
View file

@ -29,9 +29,9 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
[Required, Comment("รายละเอียดการลา")]
public string LeaveDetail { get; set; } = string.Empty;
public Document LeaveDocument { get; set; }
public Document? LeaveDocument { get; set; }
public Document LeaveDraftDocument { get; set; }
public Document? LeaveDraftDocument { get; set; }
public string LeaveSalaryText { get; set; } = string.Empty;
@ -101,9 +101,14 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
public string CoupleDaySumTotalHistory { get; set; } = string.Empty;
[Required, Comment("สถานะของคำร้อง")]
public string LeaveStatus { get; set; } = string.Empty;
public string LeaveComment { get; set; } = string.Empty;
[Comment("ความเห็นของผู้บังคับบัญชา")]
public string? LeaveComment { get; set; } = string.Empty;
[Comment("ความเห็นของผู้อำนวยการสำนัก")]
public string? LeaveDirectorComment { get; set; } = string.Empty;
public int LeaveTotal { get; set; } = 0;
@ -116,5 +121,14 @@ namespace BMA.EHR.Domain.Models.Leave.Requests
public DateTime? LeaveGovernmentDate { get; set; }
public int? LeaveSalary { get; set; }
[Comment("สถานะของคำขอยกเลิก")]
public string? LeaveCancelStatus { get; set; } = string.Empty;
[Comment("เหตุผลในการขอยกเลิก")]
public string? LeaveCancelComment { get; set; } = string.Empty;
[Comment("เอกสารแนบในการขอยกเลิกการลา")]
public Document? LeaveCancelDocument { get; set; }
}
}