thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ปรับปรุงหน้าจอ migration และ เงื่อนไขการค้นหา หน้าทำแบบประเมิน

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-06 11:34:25 +07:00
parent c8f4d2317c
commit 4844a0ad44
16 changed files with 1237 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs
View File

@@ -58,8 +58,11 @@ namespace TodoAPI2.Models
public int? order_at_this_time { get; set; }
public string active_mode { get; set; }
public string fullname_at_this_time { get; set; }
public string employee_no_at_this_time { get; set; }
public string active_mode { get; set; }
}
}

12
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs
View File

@@ -158,6 +158,9 @@ namespace TodoAPI2.Models
adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year,
employee_id_external_linkage_external_name = fk_external_linkageResult3.fullname,
fullname_at_this_time = m_eva_adjust_postponement_detail_migration.fullname_at_this_time,
employee_no_at_this_time = m_eva_adjust_postponement_detail_migration.employee_no_at_this_time,
isActive = m_eva_adjust_postponement_detail_migration.isActive,
Created = m_eva_adjust_postponement_detail_migration.created,
Updated = m_eva_adjust_postponement_detail_migration.updated
@@ -227,6 +230,9 @@ namespace TodoAPI2.Models
existingEntity.org_at_this_time = model.org_at_this_time;
existingEntity.order_at_this_time = model.order_at_this_time;
existingEntity.fullname_at_this_time = model.fullname_at_this_time;
existingEntity.employee_no_at_this_time = model.employee_no_at_this_time;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
}
@@ -266,6 +272,9 @@ namespace TodoAPI2.Models
existingEntity.org_at_this_time = i.org_at_this_time;
existingEntity.order_at_this_time = i.order_at_this_time;
existingEntity.fullname_at_this_time = i.fullname_at_this_time;
existingEntity.employee_no_at_this_time = i.employee_no_at_this_time;
//existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}
@@ -325,7 +334,6 @@ namespace TodoAPI2.Models
{
var i = new Dictionary<string, string>();
i.Add("adjust_postponement_id", "รหัสอ้างอิงตาราง eva_adjust_postponement");
i.Add("adjust_postponement_id_eva_adjust_postponement_fiscal_year", "รหัสอ้างอิงตาราง eva_adjust_postponement");
i.Add("adjust_postponement_quota_id", "รหัสอ้างอิงตาราง eva_adjust_postponement");
@@ -344,6 +352,8 @@ namespace TodoAPI2.Models
i.Add("new_sarary_with_quota", "เงินเดือนใหม่ (รวมโควต้า)");
i.Add("position_this_time", "ตำแหน่ง (ณ วันปรับเลื่อน)");
i.Add("level_this_time", "ระดับ (ณ วันปรับเลื่อน)");
i.Add("fullname_at_this_time", "ชื่อ-ชื่อสกุล (ณ วันปรับเลื่อน)");
i.Add("employee_no_at_this_time", "เลขที่พนักงาน (ณ วันปรับเลื่อน)");
return i;
}

6
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs
View File

@@ -51,13 +51,19 @@ namespace TodoAPI2.Models
public decimal? migration_total_score { get; set; }
public string migration_eva_result { get; set; }
public int? org_at_this_time { get; set; }
public int? order_at_this_time { get; set; }
public string fullname_at_this_time { get; set; }
public string employee_no_at_this_time { get; set; }
public int? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; }
public string employee_id_external_linkage_external_name { get; set; }
public string org_at_this_time_external_linkage_external_name { get; set; }
}
}

1
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs
View File

@@ -9,5 +9,6 @@ namespace TodoAPI2.Models
{
public List<external_employeeViewModel> item_employee_id { get; set; }
public List<external_linkageViewModel> item_org_at_this_time { get; set; }
}
}