Merge branch 'develop' into working
This commit is contained in:
commit
cd54079a47
31 changed files with 27955 additions and 181 deletions
20074
BMA.EHR.Infrastructure/Migrations/20250417083557_update_table_disciplineresult_add_remark.Designer.cs
generated
Normal file
20074
BMA.EHR.Infrastructure/Migrations/20250417083557_update_table_disciplineresult_add_remark.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,22 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class update_table_disciplineresult_add_remark : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,86 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class update_table_disciplineresult_add_remark : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "DocumentRejectId",
|
||||
table: "DisciplineInvestigate_ProfileComplaints",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "RemarkReject",
|
||||
table: "DisciplineInvestigate_ProfileComplaints",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "หมายเหตุยุติเรื่อง")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Offense",
|
||||
table: "DisciplineDisciplinary_ProfileComplaintInvestigates",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "ฐานความผิดรายบุคคล")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Remark",
|
||||
table: "DisciplineDisciplinary_ProfileComplaintInvestigates",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "ฐานความผิดรายบุคคลหมายเหตุ")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_DisciplineInvestigate_ProfileComplaints_DocumentRejectId",
|
||||
table: "DisciplineInvestigate_ProfileComplaints",
|
||||
column: "DocumentRejectId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_DisciplineInvestigate_ProfileComplaints_Documents_DocumentRe~",
|
||||
table: "DisciplineInvestigate_ProfileComplaints",
|
||||
column: "DocumentRejectId",
|
||||
principalTable: "Documents",
|
||||
principalColumn: "Id");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_DisciplineInvestigate_ProfileComplaints_Documents_DocumentRe~",
|
||||
table: "DisciplineInvestigate_ProfileComplaints");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_DisciplineInvestigate_ProfileComplaints_DocumentRejectId",
|
||||
table: "DisciplineInvestigate_ProfileComplaints");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "DocumentRejectId",
|
||||
table: "DisciplineInvestigate_ProfileComplaints");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "RemarkReject",
|
||||
table: "DisciplineInvestigate_ProfileComplaints");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Offense",
|
||||
table: "DisciplineDisciplinary_ProfileComplaintInvestigates");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Remark",
|
||||
table: "DisciplineDisciplinary_ProfileComplaintInvestigates");
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,55 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class update_table_disciplineresult_add_remark1 : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineInvestigates",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
comment: "RootDnaId",
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineDisciplinarys",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
comment: "RootDnaId",
|
||||
collation: "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<Guid>(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineComplaints",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
comment: "RootDnaId",
|
||||
collation: "ascii_general_ci");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineInvestigates");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineDisciplinarys");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "RootDnaId",
|
||||
table: "DisciplineComplaints");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -123,6 +123,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnType("longtext")
|
||||
.HasComment("ผลการตรวจสอบ");
|
||||
|
||||
b.Property<Guid?>("RootDnaId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasComment("RootDnaId");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("longtext")
|
||||
|
|
@ -1030,6 +1034,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnType("int")
|
||||
.HasComment("ปีงบประมาณ");
|
||||
|
||||
b.Property<Guid?>("RootDnaId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasComment("RootDnaId");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("longtext")
|
||||
|
|
@ -1851,6 +1859,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnOrder(102)
|
||||
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
|
||||
|
||||
b.Property<string>("Offense")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("ฐานความผิดรายบุคคล");
|
||||
|
||||
b.Property<string>("Organization")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("สังกัด");
|
||||
|
|
@ -1871,6 +1883,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnType("longtext")
|
||||
.HasComment("คำนำหน้า");
|
||||
|
||||
b.Property<string>("Remark")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("ฐานความผิดรายบุคคลหมายเหตุ");
|
||||
|
||||
b.Property<double?>("Salary")
|
||||
.HasColumnType("double")
|
||||
.HasComment("เงินเดือน");
|
||||
|
|
@ -2141,6 +2157,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnType("longtext")
|
||||
.HasComment("ผลการตรวจสอบเรื่องร้องเรียน");
|
||||
|
||||
b.Property<Guid?>("RootDnaId")
|
||||
.HasColumnType("char(36)")
|
||||
.HasComment("RootDnaId");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("longtext")
|
||||
|
|
@ -2531,6 +2551,9 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
b.Property<Guid>("DisciplineInvestigateId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid?>("DocumentRejectId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("FirstName")
|
||||
.IsRequired()
|
||||
.HasMaxLength(100)
|
||||
|
|
@ -2594,6 +2617,10 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.HasColumnType("longtext")
|
||||
.HasComment("คำนำหน้า");
|
||||
|
||||
b.Property<string>("RemarkReject")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("หมายเหตุยุติเรื่อง");
|
||||
|
||||
b.Property<double?>("Salary")
|
||||
.HasColumnType("double")
|
||||
.HasComment("เงินเดือน");
|
||||
|
|
@ -2706,6 +2733,8 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
|
||||
b.HasIndex("DisciplineInvestigateId");
|
||||
|
||||
b.HasIndex("DocumentRejectId");
|
||||
|
||||
b.ToTable("DisciplineInvestigate_ProfileComplaints");
|
||||
});
|
||||
|
||||
|
|
@ -3487,7 +3516,13 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
|||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("BMA.EHR.Domain.Models.Discipline.Document", "DocumentReject")
|
||||
.WithMany()
|
||||
.HasForeignKey("DocumentRejectId");
|
||||
|
||||
b.Navigation("DisciplineInvestigate");
|
||||
|
||||
b.Navigation("DocumentReject");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("BMA.EHR.Domain.Models.Discipline.DisciplineReport_Profile", b =>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue