เครื่องราชเช็คตามรายการ
This commit is contained in:
parent
2efc1910f6
commit
a951378b1f
21 changed files with 57711 additions and 61 deletions
|
|
@ -70,9 +70,6 @@ namespace BMA.EHR.Infrastructure.MessageQueue
|
|||
|
||||
#region " Properties "
|
||||
|
||||
private bool? RoleAdmin => _httpContextAccessor?.HttpContext?.User?.IsInRole("admin");
|
||||
private bool? RoleInsignia1 => _httpContextAccessor?.HttpContext?.User?.IsInRole("insignia1");
|
||||
private bool? RoleInsignia2 => _httpContextAccessor?.HttpContext?.User?.IsInRole("insignia2");
|
||||
private string? AccessToken => _httpContextAccessor?.HttpContext?.Request.Headers["Authorization"];
|
||||
|
||||
#endregion
|
||||
|
|
@ -113,7 +110,7 @@ namespace BMA.EHR.Infrastructure.MessageQueue
|
|||
if (requestStatus == null)
|
||||
{
|
||||
// บันทึกรายชื่อ
|
||||
await insigniaRepo.InsertCandidate(period, organization.Id, candidate);
|
||||
await insigniaRepo.InsertCandidate(period, organization.Id,organization.OrgRootName, candidate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
19149
BMA.EHR.Infrastructure/Migrations/20241113071721_update table InsigniaRequest add org.Designer.cs
generated
Normal file
19149
BMA.EHR.Infrastructure/Migrations/20241113071721_update table InsigniaRequest add org.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,29 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class updatetableInsigniaRequestaddorg : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "Organization",
|
||||
table: "InsigniaRequests",
|
||||
type: "longtext",
|
||||
nullable: false)
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "Organization",
|
||||
table: "InsigniaRequests");
|
||||
}
|
||||
}
|
||||
}
|
||||
19152
BMA.EHR.Infrastructure/Migrations/20241113092721_update table InsigniaRequest add org2.Designer.cs
generated
Normal file
19152
BMA.EHR.Infrastructure/Migrations/20241113092721_update table InsigniaRequest add org2.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,58 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class updatetableInsigniaRequestaddorg2 : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsCancel",
|
||||
table: "RetirementResignEmployees",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false,
|
||||
comment: "สถานะยกเลิก");
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "Organization",
|
||||
table: "InsigniaRequests",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "longtext")
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
.OldAnnotation("MySql:CharSet", "utf8mb4");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsCancel",
|
||||
table: "RetirementResignEmployees");
|
||||
|
||||
migrationBuilder.UpdateData(
|
||||
table: "InsigniaRequests",
|
||||
keyColumn: "Organization",
|
||||
keyValue: null,
|
||||
column: "Organization",
|
||||
value: "");
|
||||
|
||||
migrationBuilder.AlterColumn<string>(
|
||||
name: "Organization",
|
||||
table: "InsigniaRequests",
|
||||
type: "longtext",
|
||||
nullable: false,
|
||||
oldClrType: typeof(string),
|
||||
oldType: "longtext",
|
||||
oldNullable: true)
|
||||
.Annotation("MySql:CharSet", "utf8mb4")
|
||||
.OldAnnotation("MySql:CharSet", "utf8mb4");
|
||||
}
|
||||
}
|
||||
}
|
||||
19156
BMA.EHR.Infrastructure/Migrations/20241113095244_update table Retire add iscancel.Designer.cs
generated
Normal file
19156
BMA.EHR.Infrastructure/Migrations/20241113095244_update table Retire add iscancel.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,30 @@
|
|||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class updatetableRetireaddiscancel : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsCancel",
|
||||
table: "RetirementResigns",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false,
|
||||
comment: "สถานะยกเลิก");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsCancel",
|
||||
table: "RetirementResigns");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6339,6 +6339,9 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
.HasColumnOrder(102)
|
||||
.HasComment("แก้ไขข้อมูลล่าสุดเมื่อ");
|
||||
|
||||
b.Property<string>("Organization")
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<Guid>("OrganizationId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
|
|
@ -15858,6 +15861,10 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะการใช้งาน");
|
||||
|
||||
b.Property<bool>("IsCancel")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะยกเลิก");
|
||||
|
||||
b.Property<bool>("IsDiscipline")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะพฤติการณ์ทางวินัย");
|
||||
|
|
@ -16547,6 +16554,10 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะการใช้งาน");
|
||||
|
||||
b.Property<bool>("IsCancel")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะยกเลิก");
|
||||
|
||||
b.Property<bool>("IsDiscipline")
|
||||
.HasColumnType("tinyint(1)")
|
||||
.HasComment("สถานะพฤติการณ์ทางวินัย");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue