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

เพิ่ม type ประเภทประกาศพ้นราชการ

Browse source
This commit is contained in:
Kittapath 2023-08-07 13:18:08 +07:00
parent e1e3aeff5c
commit 3582a6d783
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Domain/Models/Organizations/OrganizationEntity.cs
View file

@ -35,11 +35,11 @@ namespace BMA.EHR.Domain.Models.Organizations
[Column(Order = 9), Comment("ParentId")] [Column(Order = 9), Comment("ParentId")]
public OrganizationEntity? Parent { get; set; } public OrganizationEntity? Parent { get; set; }
// [Column(Order = 10), Comment("OrganizationAgencyId")] [Column(Order = 10), Comment("OrganizationAgencyId")]
// public OrganizationAgency? OrganizationAgency { get; set; } public OrganizationAgency? OrganizationAgency { get; set; }
// [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")] [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
// public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; } public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
[Column(Order = 12), Comment("OrganizationOrder")] [Column(Order = 12), Comment("OrganizationOrder")]
public int? OrganizationOrder { get; set; } public int? OrganizationOrder { get; set; }

2
BMA.EHR.Retirement.Service/Controllers/RetirementController.cs
View file

@ -164,6 +164,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Year = x.Year, Year = x.Year,
Round = x.Round, Round = x.Round,
Total = x.Total, Total = x.Total,
TypeReport = x.TypeReport,
Json = true, Json = true,
}) })
.ToListAsync(); .ToListAsync();
@ -182,6 +183,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
Year = retire.Year, Year = retire.Year,
Round = retire.Round, Round = retire.Round,
Total = retire.RetirementProfiles.Count(), Total = retire.RetirementProfiles.Count(),
TypeReport = retire.TypeReport,
Json = false, Json = false,
}); });
} }