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

change fore new field

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-07-16 20:01:24 +07:00
parent d5670f11fd
commit 0324e4c270
12 changed files with 754 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Models/AvailablePositionLevelEntity.cs
View file

@ -1,11 +1,9 @@

using BMA.EHR.Organization.Service.Models;
using BMA.EHR.Report.Service.Models;
using BMA.EHR.MetaData.Service.Models;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace BMA.EHR.Profile.Service.Models
namespace BMA.EHR.Organization.Service.Models
{
public class AvailablePositionLevelEntity : EntityBase
{

19
Models/OrganizationEntity.cs
View file

@ -1,9 +1,9 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Report.Service.Models;
using BMA.EHR.MetaData.Service.Models;
namespace BMA.EHR.Profile.Service.Models
namespace BMA.EHR.Organization.Service.Models
{
public class OrganizationEntity : EntityBase
{
@ -67,6 +67,21 @@ namespace BMA.EHR.Profile.Service.Models
[Column(Order = 13), Comment("OrganizationUserNote")]
public string? OrganizationUserNote { get; set; }
[Column(Order = 14), Comment("หน่วยงาน")]
public string? Agency { get; set; }
[Column(Order = 15), Comment("ส่วนราชการ")]
public string? Government { get; set; }
[Column(Order = 16), Comment("ฝ่าย/ส่วน")]
public string? Department { get; set; }
[Column(Order = 17), Comment("กอง")]
public string? Pile { get; set; }
public Guid? OrganizationStatusId { get; set; }
public List<OrganizationEntity> Organizations { get; } = new();
}

13
Models/OrganizationPositionEntity.cs
View file

@ -1,13 +1,13 @@
using BMA.EHR.Organization.Service.Models;
using BMA.EHR.Report.Service.Models;
using BMA.EHR.MetaData.Service.Models;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace BMA.EHR.Profile.Service.Models
namespace BMA.EHR.Organization.Service.Models
{
public class OrganizationPositionEntity : EntityBase
{
[ForeignKey("PositionMasterId")]
public PositionMasterEntity? PositionMaster_PositionMasterId { get; set; }
@ -28,5 +28,12 @@ namespace BMA.EHR.Profile.Service.Models
[Column(Order = 6), Comment("PositionNumberId")]
public Guid? PositionNumberId { get; set; }
[Column(Order = 7), Comment("ติดเงื่อนไข")]
public bool? IsCondition { get; set; }
[Column(Order = 8), Comment("รายละเอียดเงื่อนไข")]
public string? ConditionNote { get; set; }
}
}

17
Models/OrganizationPublishFileEntity.cs Normal file
View file

@ -0,0 +1,17 @@
using BMA.EHR.MetaData.Service.Models;
using System.ComponentModel.DataAnnotations;
namespace BMA.EHR.Organization.Service.Models
{
/// <summary>
/// เก็บข้อมูลไฟล์ structure ที่ถูกสร้างตอนทำการ publish
/// </summary>
public class OrganizationPublishFileEntity : EntityBase
{
[Required]
public string Description { get; set; } = string.Empty;
[Required]
public string FileName { get; set; } = string.Empty;
}
}

15
Models/OrganizationPublishHistoryEntity.cs Normal file
View file

@ -0,0 +1,15 @@
using BMA.EHR.MetaData.Service.Models;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
namespace BMA.EHR.Organization.Service.Models
{
public class OrganizationPublishHistoryEntity : EntityBase
{
[Column(Order = 1), Comment("รายละเอียดการแก้ไข")]
public string Detail { get; set; } = string.Empty;
[Column(Order = 2), Comment("เก็บ Object ที่มีการอัพเดตในระบบ")]
public string ObjectValue { get; set; } = string.Empty;
}
}

2
Models/PositionMasterEntity.cs
View file

@ -73,7 +73,7 @@ namespace BMA.EHR.Organization.Service.Models
public string? PositionExecutiveSideObject { get; set; }
//public List<AvailablePositionLevelEntity> AvailablePositionLevels { get; } = new();
//public List<PositionMasterHistoryEntity> PositionMasterHistorys { get; } = new();
public List<PositionMasterHistoryEntity> PositionMasterHistorys { get; } = new();
}
}

54
Models/PositionMasterHistoryEntity.cs Normal file
View file

@ -0,0 +1,54 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.MetaData.Service.Models;
namespace BMA.EHR.Organization.Service.Models
{
public class PositionMasterHistoryEntity : EntityBase
{
[Column(Order = 2), Comment("Position")]
public string? Position { get; set; }
[Column(Order = 3), Comment("PositionPath")]
public string? PositionPath { get; set; }
[Column(Order = 4), Comment("PositionType")]
public string? PositionType { get; set; }
[Column(Order = 5), Comment("PositionExecutive")]
public string? PositionExecutive { get; set; }
[Column(Order = 6), Comment("PositionExecutiveSide")]
public string? PositionExecutiveSide { get; set; }
[Column(Order = 7), Comment("PositionPathSide")]
public string? PositionPathSide { get; set; }
[Column(Order = 8), Comment("PositionLine")]
public string? PositionLine { get; set; }
[Column(Order = 10), Comment("PositionStatus")]
public string? PositionStatus { get; set; }
[Column(Order = 11), Comment("PositionCondition")]
public string? PositionCondition { get; set; }
[Column(Order = 12), Comment("PositionLevel")]
public string? PositionLevel { get; set; }
[Column(Order = 13), Comment("PositionMasterUserNote")]
public string? PositionMasterUserNote { get; set; }
[Column(Order = 14), Comment("IsDirector")]
public bool? IsDirector { get; set; }
[Column(Order = 15), Comment("คุณวุฒิ")]
public string? Qualification { get; set; }
public PositionMasterEntity? PositionMasterEntity { get; set; }
public string? PositionPathSideObject { get; set; }
public string? PositionExecutiveSideObject { get; set; }
}
}

8
Models/PositionNumberEntity.cs
View file

@ -1,9 +1,9 @@
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Report.Service.Models;
using BMA.EHR.MetaData.Service.Models;
namespace BMA.EHR.Profile.Service.Models
namespace BMA.EHR.Organization.Service.Models
{
public class PositionNumberEntity : EntityBase
{
@ -16,5 +16,9 @@ namespace BMA.EHR.Profile.Service.Models
[Column(Order = 3), Comment("Shortname")]
public Guid? OrganizationShortNameId { get; set; }
}
}

7
Models/ProfilePosition.cs
View file

@ -1,9 +1,8 @@
using Microsoft.EntityFrameworkCore;
using BMA.EHR.MetaData.Service.Models;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using BMA.EHR.Report.Service.Models;
namespace BMA.EHR.Profile.Service.Models
namespace BMA.EHR.Organization.Service.Models
{
/// <summary>
/// Link Profile กับ OrganizationPosition