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 2024-01-26 09:02:07 +07:00
parent 491ee1a302
commit 2f51a4e26e
10 changed files with 3089 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -141,6 +141,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
LastName = p.LastName, LastName = p.LastName,
Position = p.Position, Position = p.Position,
PositionLevel = p.PositionLevel, PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary, Salary = p.Salary,
PersonId = p.PersonId, PersonId = p.PersonId,
PosNo = p.PosNo, PosNo = p.PosNo,
@ -249,6 +250,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
PosNo = item.posNo, PosNo = item.posNo,
Position = item.position, Position = item.position,
PositionLevel = item.positionLevel, PositionLevel = item.positionLevel,
IsAncestorDNA = true,
CreatedFullName = FullName ?? "System Administrator", CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", CreatedUserId = UserId ?? "",
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
@ -318,6 +320,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
Organization = item.organization, Organization = item.organization,
Position = item.position, Position = item.position,
PositionLevel = item.positionLevel, PositionLevel = item.positionLevel,
IsAncestorDNA = true,
Salary = item.salary, Salary = item.salary,
PersonId = item.personId, PersonId = item.personId,
PosNo = item.posNo, PosNo = item.posNo,
@ -450,6 +453,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
PosNo = item.PosNo, PosNo = item.PosNo,
Position = item.Position, Position = item.Position,
PositionLevel = item.PositionLevel, PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
IsDisciplinary = false, IsDisciplinary = false,
CreatedFullName = FullName ?? "System Administrator", CreatedFullName = FullName ?? "System Administrator",
CreatedUserId = UserId ?? "", CreatedUserId = UserId ?? "",

2
BMA.EHR.Discipline.Service/Controllers/DisciplineDisciplinaryController.cs
View file

@ -459,6 +459,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
LastName = p.LastName, LastName = p.LastName,
Position = p.Position, Position = p.Position,
PositionLevel = p.PositionLevel, PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary, Salary = p.Salary,
PersonId = p.PersonId, PersonId = p.PersonId,
PosNo = p.PosNo, PosNo = p.PosNo,
@ -688,6 +689,7 @@ namespace BMA.EHR.DisciplineDisciplinary.Service.Controllers
Organization = item.organization, Organization = item.organization,
Position = item.position, Position = item.position,
PositionLevel = item.positionLevel, PositionLevel = item.positionLevel,
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary, Salary = item.salary,
PersonId = item.personId, PersonId = item.personId,
PosNo = item.posNo, PosNo = item.posNo,

3
BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
View file

@ -287,6 +287,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
LastName = p.LastName, LastName = p.LastName,
Position = p.Position, Position = p.Position,
PositionLevel = p.PositionLevel, PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary, Salary = p.Salary,
PersonId = p.PersonId, PersonId = p.PersonId,
PosNo = p.PosNo, PosNo = p.PosNo,
@ -453,6 +454,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
Organization = item.organization, Organization = item.organization,
Position = item.position, Position = item.position,
PositionLevel = item.positionLevel, PositionLevel = item.positionLevel,
IsAncestorDNA = isReport == null ? false : isReport.IsAncestorDNA,
Salary = item.salary, Salary = item.salary,
PersonId = item.personId, PersonId = item.personId,
PosNo = item.posNo, PosNo = item.posNo,
@ -579,6 +581,7 @@ namespace BMA.EHR.DisciplineInvestigate.Service.Controllers
PosNo = item.PosNo, PosNo = item.PosNo,
Position = item.Position, Position = item.Position,
PositionLevel = item.PositionLevel, PositionLevel = item.PositionLevel,
IsAncestorDNA = true,
Status = "NEW", Status = "NEW",
StatusDiscard = "NEW", StatusDiscard = "NEW",
IsReport = "NEW", IsReport = "NEW",

1
BMA.EHR.Discipline.Service/Controllers/DisciplineResultController.cs
View file

@ -129,6 +129,7 @@ namespace BMA.EHR.DisciplineResult.Service.Controllers
LastName = p.LastName, LastName = p.LastName,
Position = p.Position, Position = p.Position,
PositionLevel = p.PositionLevel, PositionLevel = p.PositionLevel,
IsAncestorDNA = p.IsAncestorDNA,
Salary = p.Salary, Salary = p.Salary,
PersonId = p.PersonId, PersonId = p.PersonId,
PosNo = p.PosNo, PosNo = p.PosNo,

2
BMA.EHR.Domain/Models/Discipline/DisciplineComplaint_Profile.cs
View file

@ -29,6 +29,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? PositionLevel { get; set; } public string? PositionLevel { get; set; }
[Comment("เงินเดือน")] [Comment("เงินเดือน")]
public double? Salary { get; set; } public double? Salary { get; set; }
[Comment("รายการเก่า")]
public bool? IsAncestorDNA { get; set; } = false;
[Required, Comment("Id เรื่องร้องเรียน")] [Required, Comment("Id เรื่องร้องเรียน")]
public DisciplineComplaint DisciplineComplaint { get; set; } public DisciplineComplaint DisciplineComplaint { get; set; }
} }

2
BMA.EHR.Domain/Models/Discipline/DisciplineDisciplinary_ProfileComplaintInvestigate.cs
View file

@ -41,6 +41,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? IsReport { get; set; } = "NEW"; public string? IsReport { get; set; } = "NEW";
[Comment("ส่งไปพักราชการ")] [Comment("ส่งไปพักราชการ")]
public string? IsSuspend { get; set; } = "NEW"; public string? IsSuspend { get; set; } = "NEW";
[Comment("รายการเก่า")]
public bool? IsAncestorDNA { get; set; } = false;
[Required, Comment("Id เรื่องสอบสวน")] [Required, Comment("Id เรื่องสอบสวน")]
public DisciplineDisciplinary DisciplineDisciplinary { get; set; } public DisciplineDisciplinary DisciplineDisciplinary { get; set; }
// public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>(); // public virtual List<DisciplineReport_Profile> DisciplineReport_Profiles { get; set; } = new List<DisciplineReport_Profile>();

2
BMA.EHR.Domain/Models/Discipline/DisciplineInvestigate_ProfileComplaint.cs
View file

@ -33,6 +33,8 @@ namespace BMA.EHR.Domain.Models.Discipline
public string? IsReport { get; set; } = "NEW"; public string? IsReport { get; set; } = "NEW";
[Comment("ส่งไปสอบสวน")] [Comment("ส่งไปสอบสวน")]
public bool? IsDisciplinary { get; set; } = false; public bool? IsDisciplinary { get; set; } = false;
[Comment("รายการเก่า")]
public bool? IsAncestorDNA { get; set; } = false;
[Required, Comment("Id เรื่องสืบสวน")] [Required, Comment("Id เรื่องสืบสวน")]
public DisciplineInvestigate DisciplineInvestigate { get; set; } public DisciplineInvestigate DisciplineInvestigate { get; set; }
} }

3010
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240125110132_update table DisciplineDisciplinary_ProfileComplaintInvestigates add IsAncestorDNA.Designer.cs generated Normal file
View file

File diff suppressed because it is too large Load diff

51
BMA.EHR.Infrastructure/Migrations/DisciplineDb/20240125110132_update table DisciplineDisciplinary_ProfileComplaintInvestigates add IsAncestorDNA.cs Normal file
View file

@ -0,0 +1,51 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
{
/// <inheritdoc />
public partial class updatetableDisciplineDisciplinary_ProfileComplaintInvestigatesaddIsAncestorDNA : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsAncestorDNA",
table: "DisciplineInvestigate_ProfileComplaints",
type: "tinyint(1)",
nullable: true,
comment: "รายการเก่า");
migrationBuilder.AddColumn<bool>(
name: "IsAncestorDNA",
table: "DisciplineDisciplinary_ProfileComplaintInvestigates",
type: "tinyint(1)",
nullable: true,
comment: "รายการเก่า");
migrationBuilder.AddColumn<bool>(
name: "IsAncestorDNA",
table: "DisciplineComplaint_Profiles",
type: "tinyint(1)",
nullable: true,
comment: "รายการเก่า");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsAncestorDNA",
table: "DisciplineInvestigate_ProfileComplaints");
migrationBuilder.DropColumn(
name: "IsAncestorDNA",
table: "DisciplineDisciplinary_ProfileComplaintInvestigates");
migrationBuilder.DropColumn(
name: "IsAncestorDNA",
table: "DisciplineComplaint_Profiles");
}
}
}

12
BMA.EHR.Infrastructure/Migrations/DisciplineDb/DisciplineDbContextModelSnapshot.cs
View file

@ -518,6 +518,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("varchar(100)") .HasColumnType("varchar(100)")
.HasComment("ชื่อ"); .HasComment("ชื่อ");
b.Property<bool?>("IsAncestorDNA")
.HasColumnType("tinyint(1)")
.HasComment("รายการเก่า");
b.Property<string>("LastName") b.Property<string>("LastName")
.IsRequired() .IsRequired()
.HasMaxLength(100) .HasMaxLength(100)
@ -1673,6 +1677,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("varchar(100)") .HasColumnType("varchar(100)")
.HasComment("ชื่อ"); .HasComment("ชื่อ");
b.Property<bool?>("IsAncestorDNA")
.HasColumnType("tinyint(1)")
.HasComment("รายการเก่า");
b.Property<string>("IsReport") b.Property<string>("IsReport")
.HasColumnType("longtext") .HasColumnType("longtext")
.HasComment("ส่งไปยุติเรื่อง"); .HasComment("ส่งไปยุติเรื่อง");
@ -2280,6 +2288,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
.HasColumnType("varchar(100)") .HasColumnType("varchar(100)")
.HasComment("ชื่อ"); .HasComment("ชื่อ");
b.Property<bool?>("IsAncestorDNA")
.HasColumnType("tinyint(1)")
.HasComment("รายการเก่า");
b.Property<bool?>("IsDisciplinary") b.Property<bool?>("IsDisciplinary")
.HasColumnType("tinyint(1)") .HasColumnType("tinyint(1)")
.HasComment("ส่งไปสอบสวน"); .HasComment("ส่งไปสอบสวน");