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

แก้ไขข้อมมูลบุคคลบรรจุ

Browse source
This commit is contained in:
Kittapath 2023-07-05 16:22:44 +07:00
parent 0c56512f54
commit 258a95a0e2
19 changed files with 11975 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

13
BMA.EHR.Domain/Models/Organizations/AvailablePositionLevelEntity.cs
View file

@ -1,4 +1,5 @@
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
@ -8,17 +9,13 @@ namespace BMA.EHR.Domain.Models.Organizations
public class AvailablePositionLevelEntity : EntityBase
{
[ForeignKey("PositionMasterId")]
public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
// [ForeignKey("PositionMasterId")]
// public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
[Column(Order = 2), Comment("PositionMasterId")]
public Guid? PositionMasterId { get; set; }
public PositionMasterEntity? PositionMaster { get; set; }
[Column(Order = 3), Comment("PositionLevelId")]
public Guid? PositionLevelId { get; set; }
public PositionLevel? PositionLevel { get; set; }
}
}

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

@ -2,65 +2,44 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
public class OrganizationEntity : EntityBase
{
//[ForeignKey("OrganizationOrganizationId")]
//public OrganizationOrganization? OrganizationOrganization_OrganizationOrganizationId { get; set; }
[Column(Order = 2), Comment("OrganizationOrganizationId")]
public Guid? OrganizationOrganizationId { get; set; }
//[ForeignKey("OrganizationShortNameId")]
//public OrganizationShortName? OrganizationShortName_OrganizationShortNameId { get; set; }
public OrganizationOrganization? OrganizationOrganization { get; set; }
[Column(Order = 3), Comment("OrganizationShortNameId")]
public Guid? OrganizationShortNameId { get; set; }
//[ForeignKey("OrganizationTypeId")]
//public OrganizationType? OrganizationType_OrganizationTypeId { get; set; }
public OrganizationShortName? OrganizationShortName { get; set; }
[Column(Order = 4), Comment("OrganizationTypeId")]
public Guid? OrganizationTypeId { get; set; }
//[ForeignKey("OrganizationLevelId")]
//public OrganizationLevel? OrganizationLevel_OrganizationLevelId { get; set; }
public OrganizationType? OrganizationType { get; set; }
[Column(Order = 5), Comment("OrganizationLevelId")]
public Guid? OrganizationLevelId { get; set; }
//[ForeignKey("OrganizationTelExternalId")]
//public OrganizationTelExternal? OrganizationTelExternal_OrganizationTelExternalId { get; set; }
public OrganizationLevel? OrganizationLevel { get; set; }
[Column(Order = 6), Comment("OrganizationTelExternalId")]
public Guid? OrganizationTelExternalId { get; set; }
//[ForeignKey("OrganizationTelInternalId")]
//public OrganizationTelInternal? OrganizationTelInternal_OrganizationTelInternalId { get; set; }
public OrganizationTelExternal? OrganizationTelExternal { get; set; }
[Column(Order = 7), Comment("OrganizationTelInternalId")]
public Guid? OrganizationTelInternalId { get; set; }
//[ForeignKey("OrganizationFaxId")]
//public OrganizationFax? OrganizationFax_OrganizationFaxId { get; set; }
public OrganizationTelInternal? OrganizationTelInternal { get; set; }
[Column(Order = 8), Comment("OrganizationFaxId")]
public Guid? OrganizationFaxId { get; set; }
public OrganizationFax? OrganizationFax { get; set; }
[ForeignKey("ParentId")]
public OrganizationEntity? Organization_ParentId { get; set; }
// [ForeignKey("ParentId")]
// public OrganizationEntity? Organization_ParentId { get; set; }
[Column(Order = 9), Comment("ParentId")]
public Guid? ParentId { get; set; }
public OrganizationEntity? Parent { get; set; }
[Column(Order = 10), Comment("OrganizationAgencyId")]
public Guid? OrganizationAgencyId { get; set; }
// [Column(Order = 10), Comment("OrganizationAgencyId")]
// public OrganizationAgency? OrganizationAgency { get; set; }
[Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
public Guid? OrganizationGovernmentAgencyId { get; set; }
// [Column(Order = 11), Comment("OrganizationGovernmentAgencyId")]
// public OrganizationGovernmentAgency? OrganizationGovernmentAgency { get; set; }
[Column(Order = 12), Comment("OrganizationOrder")]
public int? OrganizationOrder { get; set; }
@ -80,7 +59,7 @@ namespace BMA.EHR.Domain.Models.Organizations
[Column(Order = 17), Comment("กอง")]
public string? Pile { get; set; }
public Guid? OrganizationStatusId { get; set; }
public OrganizationStatus? OrganizationStatus { get; set; }
public List<OrganizationEntity> Organizations { get; } = new();

14
BMA.EHR.Domain/Models/Organizations/OrganizationPositionEntity.cs
View file

@ -8,11 +8,11 @@ namespace BMA.EHR.Domain.Models.Organizations
public class OrganizationPositionEntity : EntityBase
{
[ForeignKey("PositionMasterId")]
public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
// [ForeignKey("PositionMasterId")]
// public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
[Column(Order = 2), Comment("Position Master")]
public Guid? PositionMasterId { get; set; }
public PositionMasterEntity? PositionMaster { get; set; }
[Column(Order = 3), Comment("Is Director")]
public bool? IsDirector { get; set; }
@ -20,14 +20,14 @@ namespace BMA.EHR.Domain.Models.Organizations
[Column(Order = 4), Comment("positionUserNote")]
public string? PositionUserNote { get; set; }
[ForeignKey("OrganizationId")]
public OrganizationEntity? Organization_OrganizationId { get; set; }
// [ForeignKey("OrganizationId")]
// public OrganizationEntity? Organization_OrganizationId { get; set; }
[Column(Order = 5), Comment("OrganizationId")]
public Guid? OrganizationId { get; set; }
public OrganizationEntity? Organization { get; set; }
[Column(Order = 6), Comment("PositionNumberId")]
public Guid? PositionNumberId { get; set; }
public PositionNumberEntity? PositionNumber { get; set; }
}
}

40
BMA.EHR.Domain/Models/Organizations/PositionMasterEntity.cs
View file

@ -2,63 +2,39 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
public class PositionMasterEntity : EntityBase
{
//[ForeignKey("PositionId")]
//public Position? Position_PositionId { get; set; }
[Column(Order = 2), Comment("PositionId")]
public Guid? PositionId { get; set; }
//[ForeignKey("PositionPathId")]
//public PositionPath? PositionPath_PositionPathId { get; set; }
[Column(Order = 3), Comment("PositionPathId")]
public Guid? PositionPathId { get; set; }
//[ForeignKey("PositionTypeId")]
//public PositionType? PositionType_PositionTypeId { get; set; }
public PositionPath? PositionPath { get; set; }
[Column(Order = 4), Comment("PositionTypeId")]
public Guid? PositionTypeId { get; set; }
//[ForeignKey("PositionExecutiveId")]
//public PositionExecutive? PositionExecutive_PositionExecutiveId { get; set; }
public PositionType? PositionType { get; set; }
[Column(Order = 5), Comment("PositionExecutiveId")]
public Guid? PositionExecutiveId { get; set; }
//[ForeignKey("ExcutiveSideId")]
//public PositionExecutiveSide? PositionExecutiveSide_ExcutiveSideId { get; set; }
public PositionExecutive? PositionExecutive { get; set; }
[Column(Order = 6), Comment("PositionExecutiveSideId")]
public Guid? PositionExecutiveSideId { get; set; }
//[ForeignKey("PathSideId")]
//public PositionPathSide? PositionPathSide_PathSideId { get; set; }
public PositionExecutiveSide? PositionExecutiveSide { get; set; }
[Column(Order = 7), Comment("PositionPathSideId")]
public Guid? PositionPathSideId { get; set; }
public PositionPathSide? PositionPathSide { get; set; }
[Column(Order = 8), Comment("PositionLineId")]
public Guid? PositionLineId { get; set; }
//[Column(Order = 9), Comment("PositionLevelId")]
//public Guid? PositionLevelId { get; set; }
public PositionLine? PositionLine { get; set; }
[Column(Order = 10), Comment("PositionStatusId")]
public Guid? PositionStatusId { get; set; }
public PositionStatus? PositionStatus { get; set; }
[Column(Order = 11), Comment("PositionCondition")]
public string? PositionCondition { get; set; }
[Column(Order = 12), Comment("PositionStatus")]
public Guid? PositionStatus { get; set; }
[Column(Order = 13), Comment("PositionMasterUserNote")]
public string? PositionMasterUserNote { get; set; }

10
BMA.EHR.Domain/Models/Organizations/PositionNumberEntity.cs
View file

@ -2,6 +2,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.MetaData;
namespace BMA.EHR.Domain.Models.Organizations
{
@ -11,14 +12,7 @@ namespace BMA.EHR.Domain.Models.Organizations
[MaxLength(300), Column(Order = 2), Comment("ชื่อ")]
public string? Name { get; set; }
//[ForeignKey("OrganizationShortNameId")]
//public OrganizationShortName? OrganizationShortName_OrganizationShortNameId { get; set; }
[Column(Order = 3), Comment("Shortname")]
public Guid? OrganizationShortNameId { get; set; }
public OrganizationShortName? OrganizationShortName { get; set; }
}
}

7
BMA.EHR.Domain/Models/Organizations/ProfilePosition.cs
View file

@ -1,4 +1,5 @@
using BMA.EHR.Domain.Models.Base;
using BMA.EHR.Domain.Models.HR;
namespace BMA.EHR.Domain.Models.Organizations
{
@ -7,10 +8,8 @@ namespace BMA.EHR.Domain.Models.Organizations
/// </summary>
public class ProfilePosition : EntityBase
{
public OrganizationPositionEntity OrganizationPosition { get; set; }
public OrganizationPositionEntity? OrganizationPosition { get; set; }
public Guid OrganizationPositionId { get; set; }
public Guid? ProfileId { get; set; }
public Profile? Profile { get; set; }
}
}

6
BMA.EHR.Domain/Models/Placement/PlacementProfile.cs
View file

@ -56,12 +56,18 @@ namespace BMA.EHR.Domain.Models.Placement
[MaxLength(40), Comment("สัญชาติ")]
public string? Nationality { get; set; }
[MaxLength(40), Comment("เชื้อชาติ")]
public string? Race { get; set; }
[MaxLength(40), Comment("วันเกิด")]
public DateTime? DateOfBirth { get; set; }
[Comment("Id สถานภาพ")]
public Relationship? Relationship { get; set; }
[Comment("Id กลุ่มเลือด")]
public BloodGroup? BloodGroup { get; set; }
[Comment("Id ศาสนา")]
public Religion? Religion { get; set; }
[MaxLength(200), Comment("อีเมล")]
public string? Email { get; set; }