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

เพิ่มฟิลหน่วยงาน ณ วันปรับเลื่อน

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-12-13 08:45:52 +07:00
parent b205e0e302
commit 6302e828f2
12 changed files with 758 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Models/eva_adjust_postponement_detail/eva_adjust_postponement_detailEntity.cs
View File

@@ -61,5 +61,7 @@ namespace TodoAPI2.Models
[MaxLength(1000)]
public string migration_eva_result { get; set; }
public int? org_at_this_time { get; set; }
}
}

2
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationInputModel.cs
View File

@@ -54,6 +54,8 @@ namespace TodoAPI2.Models
public string migration_eva_result { get; set; }
public int? org_at_this_time { get; set; }
public string active_mode { get; set; }
}

8
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs
View File

@@ -24,7 +24,7 @@ namespace TodoAPI2.Models
private Iexternal_linkageService ext;
private Iexternal_employeeService emp;
public eva_adjust_postponement_detail_migrationService(IBaseRepository2<eva_adjust_postponement_detailEntity, int> repository,
public eva_adjust_postponement_detail_migrationService(IBaseRepository2<eva_adjust_postponement_detailEntity, int> repository,
IMyDatabase mydb, Iexternal_linkageService inext, Iexternal_employeeService inemp)
{
_repository = repository;
@@ -81,6 +81,7 @@ namespace TodoAPI2.Models
var i = Mapper.Map<eva_adjust_postponement_detail_migrationWithSelectionViewModel>(entity);
var all_emp = emp.GetAllEmployee();
i.item_employee_id = all_emp.ToList();
i.item_org_at_this_time = (from x in ext.GetDepartmentData() select x).ToList();
return i;
@@ -90,7 +91,7 @@ namespace TodoAPI2.Models
var i = new eva_adjust_postponement_detail_migrationWithSelectionViewModel();
var all_emp = emp.GetAllEmployee();
i.item_employee_id = all_emp.ToList();
i.item_org_at_this_time = (from x in ext.GetDepartmentData() select x).ToList();
return i;
}
@@ -150,6 +151,7 @@ namespace TodoAPI2.Models
other_money_at_this_time = m_eva_adjust_postponement_detail_migration.other_money_at_this_time,
migration_total_score = m_eva_adjust_postponement_detail_migration.migration_total_score,
migration_eva_result = m_eva_adjust_postponement_detail_migration.migration_eva_result,
org_at_this_time = m_eva_adjust_postponement_detail_migration.org_at_this_time,
adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year,
adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year,
@@ -221,6 +223,7 @@ namespace TodoAPI2.Models
existingEntity.other_money_at_this_time = model.other_money_at_this_time;
existingEntity.migration_total_score = model.migration_total_score;
existingEntity.migration_eva_result = model.migration_eva_result;
existingEntity.org_at_this_time = model.org_at_this_time;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -258,6 +261,7 @@ namespace TodoAPI2.Models
existingEntity.other_money_at_this_time = i.other_money_at_this_time;
existingEntity.migration_total_score = i.migration_total_score;
existingEntity.migration_eva_result = i.migration_eva_result;
existingEntity.org_at_this_time = i.org_at_this_time;
//existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);

1
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationViewModel.cs
View File

@@ -51,6 +51,7 @@ 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? adjust_postponement_id_eva_adjust_postponement_fiscal_year { get; set; }
public int? adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year { get; set; }

2
Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationWithSelectionViewModel.cs
View File

@@ -8,6 +8,6 @@ namespace TodoAPI2.Models
public class eva_adjust_postponement_detail_migrationWithSelectionViewModel: eva_adjust_postponement_detail_migrationViewModel
{
public List<external_employeeViewModel> item_employee_id { get; set; }
public List<external_linkageViewModel> item_org_at_this_time { get; set; }
}
}