no message
This commit is contained in:
kittapath
parent
519ef2f143
commit
f3e8330241
5 changed files with 19376 additions and 41 deletions
|
|
@ -47,13 +47,17 @@ namespace BMA.EHR.Domain.Models.Insignias
|
|||
[Comment("หลักฐานรับเครื่องราชฯ")]
|
||||
public Document? DocReceiveInsignia { get; set; }
|
||||
[Comment("หน่วยงานรับเครื่องราชฯ")]
|
||||
public OrganizationEntity? OrgReceiveInsignia { get; set; }
|
||||
public string? OrgReceiveInsignia { get; set; }
|
||||
[Comment("หน่วยงานรับเครื่องราชฯ")]
|
||||
public Guid? OrgReceiveInsigniaId { get; set; }
|
||||
[Comment("วันที่คืนเครื่องราชฯ")]
|
||||
public DateTime? DateReturnInsignia { get; set; }
|
||||
[Comment("หลักฐานคืนเครื่องราชฯ")]
|
||||
public Document? DocReturnInsignia { get; set; }
|
||||
[Comment("หน่วยงานคืนเครื่องราชฯ")]
|
||||
public OrganizationEntity? OrgReturnInsignia { get; set; }
|
||||
public string? OrgReturnInsignia { get; set; }
|
||||
[Comment("หน่วยงานคืนเครื่องราชฯ")]
|
||||
public Guid? OrgReturnInsigniaId { get; set; }
|
||||
|
||||
|
||||
public Guid? ProfileId { get; set; }
|
||||
|
|
|
|||
19172
BMA.EHR.Infrastructure/Migrations/20241121034320_update table insignia add OrgReceiveInsigniaId.Designer.cs
generated
Normal file
19172
BMA.EHR.Infrastructure/Migrations/20241121034320_update table insignia add OrgReceiveInsigniaId.Designer.cs
generated
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,131 @@
|
|||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace BMA.EHR.Infrastructure.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class updatetableinsigniaaddOrgReceiveInsigniaId : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_InsigniaNoteProfiles_Organizations_OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.DropForeignKey(
|
||||
name: "FK_InsigniaNoteProfiles_Organizations_OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_InsigniaNoteProfiles_OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.DropIndex(
|
||||
name: "IX_InsigniaNoteProfiles_OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
comment: "หน่วยงานคืนเครื่องราชฯ",
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
comment: "หน่วยงานรับเครื่องราชฯ",
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true)
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "OrgReceiveInsignia",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "หน่วยงานรับเครื่องราชฯ")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "OrgReturnInsignia",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "longtext",
|
||||
nullable: true,
|
||||
comment: "หน่วยงานคืนเครื่องราชฯ")
|
||||
.Annotation("MySql:CharSet", "utf8mb4");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "OrgReceiveInsignia",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "OrgReturnInsignia",
|
||||
table: "InsigniaNoteProfiles");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true,
|
||||
oldComment: "หน่วยงานคืนเครื่องราชฯ")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.AlterColumn<Guid>(
|
||||
name: "OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
type: "char(36)",
|
||||
nullable: true,
|
||||
collation: "ascii_general_ci",
|
||||
oldClrType: typeof(Guid),
|
||||
oldType: "char(36)",
|
||||
oldNullable: true,
|
||||
oldComment: "หน่วยงานรับเครื่องราชฯ")
|
||||
.OldAnnotation("Relational:Collation", "ascii_general_ci");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_InsigniaNoteProfiles_OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
column: "OrgReceiveInsigniaId");
|
||||
|
||||
migrationBuilder.CreateIndex(
|
||||
name: "IX_InsigniaNoteProfiles_OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
column: "OrgReturnInsigniaId");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_InsigniaNoteProfiles_Organizations_OrgReceiveInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
column: "OrgReceiveInsigniaId",
|
||||
principalTable: "Organizations",
|
||||
principalColumn: "Id");
|
||||
|
||||
migrationBuilder.AddForeignKey(
|
||||
name: "FK_InsigniaNoteProfiles_Organizations_OrgReturnInsigniaId",
|
||||
table: "InsigniaNoteProfiles",
|
||||
column: "OrgReturnInsigniaId",
|
||||
principalTable: "Organizations",
|
||||
principalColumn: "Id");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -6115,11 +6115,21 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
.HasColumnType("longtext")
|
||||
.HasComment("หมายเลขประกาศนียบัตรกำกับเครื่องราชฯ");
|
||||
|
||||
b.Property<string>("OrgReceiveInsignia")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("หน่วยงานรับเครื่องราชฯ");
|
||||
|
||||
b.Property<Guid?>("OrgReceiveInsigniaId")
|
||||
.HasColumnType("char(36)");
|
||||
.HasColumnType("char(36)")
|
||||
.HasComment("หน่วยงานรับเครื่องราชฯ");
|
||||
|
||||
b.Property<string>("OrgReturnInsignia")
|
||||
.HasColumnType("longtext")
|
||||
.HasComment("หน่วยงานคืนเครื่องราชฯ");
|
||||
|
||||
b.Property<Guid?>("OrgReturnInsigniaId")
|
||||
.HasColumnType("char(36)");
|
||||
.HasColumnType("char(36)")
|
||||
.HasComment("หน่วยงานคืนเครื่องราชฯ");
|
||||
|
||||
b.Property<string>("OrganizationOrganizationReceive")
|
||||
.HasColumnType("longtext")
|
||||
|
|
@ -6197,10 +6207,6 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
|
||||
b.HasIndex("InsigniaNoteId");
|
||||
|
||||
b.HasIndex("OrgReceiveInsigniaId");
|
||||
|
||||
b.HasIndex("OrgReturnInsigniaId");
|
||||
|
||||
b.HasIndex("RequestInsigniaId");
|
||||
|
||||
b.ToTable("InsigniaNoteProfiles");
|
||||
|
|
@ -17918,14 +17924,6 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "OrgReceiveInsignia")
|
||||
.WithMany()
|
||||
.HasForeignKey("OrgReceiveInsigniaId");
|
||||
|
||||
b.HasOne("BMA.EHR.Domain.Models.Organizations.OrganizationEntity", "OrgReturnInsignia")
|
||||
.WithMany()
|
||||
.HasForeignKey("OrgReturnInsigniaId");
|
||||
|
||||
b.HasOne("BMA.EHR.Domain.Models.MetaData.Insignia", "RequestInsignia")
|
||||
.WithMany()
|
||||
.HasForeignKey("RequestInsigniaId")
|
||||
|
|
@ -17938,10 +17936,6 @@ namespace BMA.EHR.Infrastructure.Migrations
|
|||
|
||||
b.Navigation("InsigniaNote");
|
||||
|
||||
b.Navigation("OrgReceiveInsignia");
|
||||
|
||||
b.Navigation("OrgReturnInsignia");
|
||||
|
||||
b.Navigation("RequestInsignia");
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1199,8 +1199,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
RequestInsigniaId = x.RequestInsignia.Id,
|
||||
RequestInsigniaShortName = x.RequestInsignia.ShortName,
|
||||
DateReceive = x.DateReceive,
|
||||
OrganizationOrganizationSend = x.Root, //hardcode
|
||||
OrganizationOrganizationReceive = x.Root, //hardcode
|
||||
x.OrganizationOrganizationSend,
|
||||
x.OrganizationOrganizationReceive,
|
||||
Status = x.Status,
|
||||
Issue = x.Issue,
|
||||
Date = x.Date,
|
||||
|
|
@ -1215,10 +1215,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
Salary = x.Salary,
|
||||
DateReceiveInsignia = x.DateReceiveInsignia,
|
||||
DocReceiveInsignia = x.DocReceiveInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReceiveInsignia.Id,
|
||||
OrgReceiveInsignia = x.Root, //hardcode
|
||||
x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsigniaId,
|
||||
DateReturnInsignia = x.DateReturnInsignia,
|
||||
DocReturnInsignia = x.DocReturnInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReturnInsignia.Id,
|
||||
OrgReturnInsignia = x.Root, //hardcode
|
||||
x.OrgReturnInsignia,
|
||||
x.OrgReturnInsigniaId,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -1236,8 +1238,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
RequestInsigniaId = x.RequestInsigniaId,
|
||||
RequestInsigniaShortName = x.RequestInsigniaShortName,
|
||||
DateReceive = x.DateReceive,
|
||||
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
|
||||
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
|
||||
x.OrganizationOrganizationSend,
|
||||
x.OrganizationOrganizationReceive,
|
||||
Status = x.Status,
|
||||
Issue = x.Issue,
|
||||
Date = x.Date,
|
||||
|
|
@ -1252,10 +1254,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
Salary = x.Salary,
|
||||
DateReceiveInsignia = x.DateReceiveInsignia,
|
||||
DocReceiveInsignia = x.DocReceiveInsignia,
|
||||
OrgReceiveInsignia = x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsigniaId,
|
||||
DateReturnInsignia = x.DateReturnInsignia,
|
||||
DocReturnInsignia = x.DocReturnInsignia,
|
||||
OrgReturnInsignia = x.OrgReturnInsignia,
|
||||
x.OrgReturnInsignia,
|
||||
x.OrgReturnInsigniaId,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -1292,9 +1296,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
insigniaNoteProfile.DateReceiveInsignia,
|
||||
DocReceiveInsignia = insigniaNoteProfile.DocReceiveInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReceiveInsignia),
|
||||
insigniaNoteProfile.OrgReceiveInsignia,
|
||||
insigniaNoteProfile.OrgReceiveInsigniaId,
|
||||
insigniaNoteProfile.DateReturnInsignia,
|
||||
DocReturnInsignia = insigniaNoteProfile.DocReturnInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReturnInsignia),
|
||||
insigniaNoteProfile.OrgReturnInsignia,
|
||||
insigniaNoteProfile.OrgReturnInsigniaId,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -1346,8 +1352,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
RequestInsigniaId = x.RequestInsignia.Id,
|
||||
RequestInsigniaShortName = x.RequestInsignia.ShortName,
|
||||
DateReceive = x.DateReceive,
|
||||
OrganizationOrganizationSend = x.Root, //hardcode
|
||||
OrganizationOrganizationReceive = x.Root, //hardcode
|
||||
x.OrganizationOrganizationSend,
|
||||
x.OrganizationOrganizationReceive,
|
||||
Status = x.Status,
|
||||
Issue = x.Issue,
|
||||
Date = x.Date,
|
||||
|
|
@ -1362,10 +1368,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
Salary = x.Salary,
|
||||
DateReceiveInsignia = x.DateReceiveInsignia,
|
||||
DocReceiveInsignia = x.DocReceiveInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReceiveInsignia.Id,
|
||||
OrgReceiveInsignia = x.Root, //hardcode
|
||||
x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsigniaId,
|
||||
DateReturnInsignia = x.DateReturnInsignia,
|
||||
DocReturnInsignia = x.DocReturnInsignia == null ? Guid.Parse("00000000-0000-0000-0000-000000000000") : x.DocReturnInsignia.Id,
|
||||
OrgReturnInsignia = x.Root, //hardcode
|
||||
x.OrgReturnInsignia,
|
||||
x.OrgReturnInsigniaId,
|
||||
})
|
||||
.ToListAsync();
|
||||
|
||||
|
|
@ -1383,8 +1391,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
RequestInsigniaId = x.RequestInsigniaId,
|
||||
RequestInsigniaShortName = x.RequestInsigniaShortName,
|
||||
DateReceive = x.DateReceive,
|
||||
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
|
||||
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
|
||||
x.OrganizationOrganizationSend,
|
||||
x.OrganizationOrganizationReceive,
|
||||
Status = x.Status,
|
||||
Issue = x.Issue,
|
||||
Date = x.Date,
|
||||
|
|
@ -1399,10 +1407,12 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
Salary = x.Salary,
|
||||
DateReceiveInsignia = x.DateReceiveInsignia,
|
||||
DocReceiveInsignia = x.DocReceiveInsignia,
|
||||
OrgReceiveInsignia = x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsignia,
|
||||
x.OrgReceiveInsigniaId,
|
||||
DateReturnInsignia = x.DateReturnInsignia,
|
||||
DocReturnInsignia = x.DocReturnInsignia,
|
||||
OrgReturnInsignia = x.OrgReturnInsignia,
|
||||
x.OrgReturnInsignia,
|
||||
x.OrgReturnInsigniaId,
|
||||
})
|
||||
.ToList();
|
||||
|
||||
|
|
@ -1439,9 +1449,11 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
insigniaNoteProfile.DateReceiveInsignia,
|
||||
DocReceiveInsignia = insigniaNoteProfile.DocReceiveInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReceiveInsignia),
|
||||
insigniaNoteProfile.OrgReceiveInsignia,
|
||||
insigniaNoteProfile.OrgReceiveInsigniaId,
|
||||
insigniaNoteProfile.DateReturnInsignia,
|
||||
DocReturnInsignia = insigniaNoteProfile.DocReturnInsignia == Guid.Parse("00000000-0000-0000-0000-000000000000") ? null : await _documentService.ImagesPath(insigniaNoteProfile.DocReturnInsignia),
|
||||
insigniaNoteProfile.OrgReturnInsignia,
|
||||
insigniaNoteProfile.OrgReturnInsigniaId,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -1478,8 +1490,8 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
RequestInsigniaId = x.RequestInsignia.Id,
|
||||
RequestInsigniaShortName = x.RequestInsignia.ShortName,
|
||||
DateReceive = x.DateReceive,
|
||||
OrganizationOrganizationSend = x.OrganizationOrganizationSend,
|
||||
OrganizationOrganizationReceive = x.OrganizationOrganizationReceive,
|
||||
x.OrganizationOrganizationSend,
|
||||
x.OrganizationOrganizationReceive,
|
||||
Status = x.Status,
|
||||
Issue = x.Issue,
|
||||
Date = x.Date,
|
||||
|
|
@ -1578,7 +1590,7 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
Address = req.Address,
|
||||
RequestInsignia = insignia,
|
||||
OrganizationOrganizationReceive = req.OrganizationOrganizationReceive,
|
||||
OrganizationOrganizationSend = req.OrganizationOrganizationSend,
|
||||
req.OrganizationOrganizationSend,
|
||||
InsigniaNote = insigniaNote,
|
||||
CreatedFullName = FullName ?? "System Administrator",
|
||||
CreatedUserId = UserId ?? "",
|
||||
|
|
@ -2383,7 +2395,18 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
var doc = await _documentService.UploadFileAsync(file, file.FileName);
|
||||
insigniaNoteProfile.DocReturnInsignia = doc;
|
||||
}
|
||||
insigniaNoteProfile.OrgReturnInsignia = await _context.Organizations.Where(x => x.Id == req.OrgId).FirstOrDefaultAsync();
|
||||
var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
|
||||
if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
|
||||
{
|
||||
if (root == null)
|
||||
return Error(GlobalMessages.OCNotFound, 404);
|
||||
}
|
||||
else
|
||||
{
|
||||
root = "สำนักนายกรัฐมนตรี";
|
||||
}
|
||||
insigniaNoteProfile.OrgReturnInsignia = root;
|
||||
insigniaNoteProfile.OrgReturnInsigniaId = req.OrgId;
|
||||
insigniaNoteProfile.DateReturnInsignia = req.Date;
|
||||
insigniaNoteProfile.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
insigniaNoteProfile.LastUpdateUserId = UserId ?? "";
|
||||
|
|
@ -2422,7 +2445,18 @@ namespace BMA.EHR.Insignia.Service.Controllers
|
|||
var doc = await _documentService.UploadFileAsync(file, file.FileName);
|
||||
insigniaNoteProfile.DocReceiveInsignia = doc;
|
||||
}
|
||||
insigniaNoteProfile.OrgReceiveInsignia = await _context.Organizations.Where(x => x.Id == req.OrgId).FirstOrDefaultAsync();
|
||||
var root = _userProfileRepository.GetOc(req.OrgId, 0, AccessToken)?.Root ?? null;
|
||||
if (req.OrgId != Guid.Parse("00000000-0000-0000-0000-000000000000"))
|
||||
{
|
||||
if (root == null)
|
||||
return Error(GlobalMessages.OCNotFound, 404);
|
||||
}
|
||||
else
|
||||
{
|
||||
root = "สำนักนายกรัฐมนตรี";
|
||||
}
|
||||
insigniaNoteProfile.OrgReceiveInsignia = root;
|
||||
insigniaNoteProfile.OrgReceiveInsigniaId = req.OrgId;
|
||||
insigniaNoteProfile.DateReceiveInsignia = req.Date;
|
||||
insigniaNoteProfile.LastUpdateFullName = FullName ?? "System Administrator";
|
||||
insigniaNoteProfile.LastUpdateUserId = UserId ?? "";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue