This commit is contained in:
parent
58f52cbb84
commit
d0b8c4ee35
5 changed files with 3658 additions and 3 deletions
|
|
@ -100,7 +100,7 @@ namespace BMA.EHR.Domain.Models.Discipline
|
||||||
|
|
||||||
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
|
[Comment("สถานภาพ (OFFICER->ข้าราชการ EMPLOYEE->ลูกจ้างประจำ)")]
|
||||||
public string? profileType { get; set; }
|
public string? profileType { get; set; }
|
||||||
[Comment("ฐานความผิดรายบุคคลหมายเหตุ")]
|
[Comment("ฐานความผิดรายบุคคลหมายเหตุ"), Column(TypeName = "text")]
|
||||||
public string? Remark { get; set; }
|
public string? Remark { get; set; }
|
||||||
[Comment("ฐานความผิดรายบุคคล")]
|
[Comment("ฐานความผิดรายบุคคล")]
|
||||||
public string? Offense { get; set; }
|
public string? Offense { get; set; }
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,44 @@
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
|
#nullable disable
|
||||||
|
|
||||||
|
namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public partial class update_table_disciplineresult_add_remark2 : Migration
|
||||||
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Up(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Remark",
|
||||||
|
table: "DisciplineDisciplinary_ProfileComplaintInvestigates",
|
||||||
|
type: "text",
|
||||||
|
nullable: true,
|
||||||
|
comment: "ฐานความผิดรายบุคคลหมายเหตุ",
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "longtext",
|
||||||
|
oldNullable: true,
|
||||||
|
oldComment: "ฐานความผิดรายบุคคลหมายเหตุ")
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4")
|
||||||
|
.OldAnnotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
protected override void Down(MigrationBuilder migrationBuilder)
|
||||||
|
{
|
||||||
|
migrationBuilder.AlterColumn<string>(
|
||||||
|
name: "Remark",
|
||||||
|
table: "DisciplineDisciplinary_ProfileComplaintInvestigates",
|
||||||
|
type: "longtext",
|
||||||
|
nullable: true,
|
||||||
|
comment: "ฐานความผิดรายบุคคลหมายเหตุ",
|
||||||
|
oldClrType: typeof(string),
|
||||||
|
oldType: "text",
|
||||||
|
oldNullable: true,
|
||||||
|
oldComment: "ฐานความผิดรายบุคคลหมายเหตุ")
|
||||||
|
.Annotation("MySql:CharSet", "utf8mb4")
|
||||||
|
.OldAnnotation("MySql:CharSet", "utf8mb4");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1884,7 +1884,7 @@ namespace BMA.EHR.Infrastructure.Migrations.DisciplineDb
|
||||||
.HasComment("คำนำหน้า");
|
.HasComment("คำนำหน้า");
|
||||||
|
|
||||||
b.Property<string>("Remark")
|
b.Property<string>("Remark")
|
||||||
.HasColumnType("longtext")
|
.HasColumnType("text")
|
||||||
.HasComment("ฐานความผิดรายบุคคลหมายเหตุ");
|
.HasComment("ฐานความผิดรายบุคคลหมายเหตุ");
|
||||||
|
|
||||||
b.Property<double?>("Salary")
|
b.Property<double?>("Salary")
|
||||||
|
|
|
||||||
|
|
@ -442,7 +442,7 @@ namespace BMA.EHR.Retirement.Service.Controllers
|
||||||
|
|
||||||
var profile_old = await _context.RetirementProfiles
|
var profile_old = await _context.RetirementProfiles
|
||||||
.Where(x => x.RetirementPeriod == retire)
|
.Where(x => x.RetirementPeriod == retire)
|
||||||
.Select((x, index) => new
|
.Select(x => new
|
||||||
{
|
{
|
||||||
order = x.Order,
|
order = x.Order,
|
||||||
id = x.Id,
|
id = x.Id,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue