update code
This commit is contained in:
@@ -24,9 +24,11 @@ namespace TodoAPI2.Models
|
||||
|
||||
public int? org_id { get; set; }
|
||||
|
||||
public int? position_id { get; set; }
|
||||
[MaxLength(1000)]
|
||||
public string position_text { get; set; }
|
||||
|
||||
public int? level_id { get; set; }
|
||||
[MaxLength(1000)]
|
||||
public string level_text { get; set; }
|
||||
|
||||
public decimal? salary { get; set; }
|
||||
|
||||
@@ -34,6 +36,10 @@ namespace TodoAPI2.Models
|
||||
|
||||
public decimal? monthly_remuneration { get; set; }
|
||||
|
||||
public decimal? cost_of_living { get; set; }
|
||||
|
||||
public int? order_of_data { get; set; }
|
||||
|
||||
|
||||
public void SetAutoField(DataContext context)
|
||||
{
|
||||
|
||||
@@ -22,9 +22,9 @@ namespace TodoAPI2.Models
|
||||
|
||||
public int? org_id { get; set; }
|
||||
|
||||
public int? position_id { get; set; }
|
||||
public string position_text { get; set; }
|
||||
|
||||
public int? level_id { get; set; }
|
||||
public string level_text { get; set; }
|
||||
|
||||
public decimal? salary { get; set; }
|
||||
|
||||
@@ -32,6 +32,10 @@ namespace TodoAPI2.Models
|
||||
|
||||
public decimal? monthly_remuneration { get; set; }
|
||||
|
||||
public decimal? cost_of_living { get; set; }
|
||||
|
||||
public int? order_of_data { get; set; }
|
||||
|
||||
public string active_mode { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,9 +80,7 @@ namespace TodoAPI2.Models
|
||||
var entity = _repository.Get(id);
|
||||
var i = Mapper.Map<eva_limit_frame_employeeWithSelectionViewModel>(entity);
|
||||
i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
|
||||
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
|
||||
i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList();
|
||||
i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList();
|
||||
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
|
||||
|
||||
|
||||
return i;
|
||||
@@ -91,9 +89,7 @@ namespace TodoAPI2.Models
|
||||
{
|
||||
var i = new eva_limit_frame_employeeWithSelectionViewModel();
|
||||
i.item_employee_id = (from x in emp.GetAllEmployee() select x).ToList();
|
||||
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
|
||||
i.item_position_id = (from x in ext.GetPositionForReport() select x).ToList();
|
||||
i.item_level_id = (from x in ext.Gethrm_position_levels() select x).ToList();
|
||||
i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList();
|
||||
|
||||
|
||||
return i;
|
||||
@@ -119,18 +115,10 @@ namespace TodoAPI2.Models
|
||||
into external_linkageResult2
|
||||
from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()
|
||||
|
||||
join fk_external_linkage3 in ext.GetSortingDep() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id
|
||||
join fk_external_linkage3 in ext.GetDepartmentData() on m_eva_limit_frame_employee.org_id equals fk_external_linkage3.id
|
||||
into external_linkageResult3
|
||||
from fk_external_linkageResult3 in external_linkageResult3.DefaultIfEmpty()
|
||||
|
||||
join fk_external_linkage4 in ext.GetPositionForReport() on m_eva_limit_frame_employee.position_id equals fk_external_linkage4.id
|
||||
into external_linkageResult4
|
||||
from fk_external_linkageResult4 in external_linkageResult4.DefaultIfEmpty()
|
||||
|
||||
join fk_external_linkage5 in ext.Gethrm_position_levels() on m_eva_limit_frame_employee.level_id equals fk_external_linkage5.id
|
||||
into external_linkageResult5
|
||||
from fk_external_linkageResult5 in external_linkageResult5.DefaultIfEmpty()
|
||||
|
||||
|
||||
where
|
||||
1 == 1
|
||||
@@ -145,17 +133,17 @@ namespace TodoAPI2.Models
|
||||
frame_group_guid = m_eva_limit_frame_employee.frame_group_guid,
|
||||
employee_id = m_eva_limit_frame_employee.employee_id,
|
||||
org_id = m_eva_limit_frame_employee.org_id,
|
||||
position_id = m_eva_limit_frame_employee.position_id,
|
||||
level_id = m_eva_limit_frame_employee.level_id,
|
||||
position_text = m_eva_limit_frame_employee.position_text,
|
||||
level_text = m_eva_limit_frame_employee.level_text,
|
||||
salary = m_eva_limit_frame_employee.salary,
|
||||
position_allowance = m_eva_limit_frame_employee.position_allowance,
|
||||
monthly_remuneration = m_eva_limit_frame_employee.monthly_remuneration,
|
||||
cost_of_living = m_eva_limit_frame_employee.cost_of_living,
|
||||
order_of_data = m_eva_limit_frame_employee.order_of_data,
|
||||
|
||||
frame_group_guid_eva_limit_frame_group_group_guid = fk_eva_limit_frame_groupResult1.group_guid,
|
||||
employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
|
||||
org_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
|
||||
position_id_external_linkage_external_name = fk_external_linkageResult4.external_name,
|
||||
level_id_external_linkage_external_name = fk_external_linkageResult5.external_name,
|
||||
|
||||
isActive = m_eva_limit_frame_employee.isActive,
|
||||
Created = m_eva_limit_frame_employee.created,
|
||||
@@ -202,11 +190,13 @@ namespace TodoAPI2.Models
|
||||
existingEntity.frame_group_guid = model.frame_group_guid;
|
||||
existingEntity.employee_id = model.employee_id;
|
||||
existingEntity.org_id = model.org_id;
|
||||
existingEntity.position_id = model.position_id;
|
||||
existingEntity.level_id = model.level_id;
|
||||
existingEntity.position_text = model.position_text;
|
||||
existingEntity.level_text = model.level_text;
|
||||
existingEntity.salary = model.salary;
|
||||
existingEntity.position_allowance = model.position_allowance;
|
||||
existingEntity.monthly_remuneration = model.monthly_remuneration;
|
||||
existingEntity.cost_of_living = model.cost_of_living;
|
||||
existingEntity.order_of_data = model.order_of_data;
|
||||
|
||||
existingEntity.SetAutoField(_repository.Context);
|
||||
|
||||
@@ -239,11 +229,13 @@ namespace TodoAPI2.Models
|
||||
existingEntity.frame_group_guid = i.frame_group_guid;
|
||||
existingEntity.employee_id = i.employee_id;
|
||||
existingEntity.org_id = i.org_id;
|
||||
existingEntity.position_id = i.position_id;
|
||||
existingEntity.level_id = i.level_id;
|
||||
existingEntity.position_text = i.position_text;
|
||||
existingEntity.level_text = i.level_text;
|
||||
existingEntity.salary = i.salary;
|
||||
existingEntity.position_allowance = i.position_allowance;
|
||||
existingEntity.monthly_remuneration = i.monthly_remuneration;
|
||||
existingEntity.cost_of_living = i.cost_of_living;
|
||||
existingEntity.order_of_data = i.order_of_data;
|
||||
|
||||
existingEntity.SetAutoField(_repository.Context);
|
||||
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
|
||||
@@ -314,15 +306,13 @@ namespace TodoAPI2.Models
|
||||
i.Add("employee_id_external_linkage_external_name", "พนักงาน");
|
||||
i.Add("org_id", "หน่วยงาน");
|
||||
i.Add("org_id_external_linkage_external_name", "หน่วยงาน");
|
||||
i.Add("position_id", "ตำแหน่ง");
|
||||
i.Add("position_id_external_linkage_external_name", "ตำแหน่ง");
|
||||
i.Add("level_id", "ระดับ");
|
||||
i.Add("level_id_external_linkage_external_name", "ระดับ");
|
||||
i.Add("position_text", "ตำแหน่ง");
|
||||
i.Add("level_text", "ระดับ");
|
||||
i.Add("salary", "เงินเดือน");
|
||||
i.Add("position_allowance", "เงินประจำตำแหน่ง");
|
||||
i.Add("monthly_remuneration", "ค่าตอบแทนรายเดือน");
|
||||
i.Add("limit_frame_group_id", "limit_frame_group_id");
|
||||
i.Add("limit_frame_group_id_eva_limit_frame_group_group_guid", "limit_frame_group_id");
|
||||
i.Add("cost_of_living", "ค่าครองชีพ");
|
||||
i.Add("order_of_data", "ลำดับ");
|
||||
|
||||
return i;
|
||||
}
|
||||
@@ -335,4 +325,5 @@ namespace TodoAPI2.Models
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,9 +20,9 @@ namespace TodoAPI2.Models
|
||||
|
||||
public int? org_id { get; set; }
|
||||
|
||||
public int? position_id { get; set; }
|
||||
public string position_text { get; set; }
|
||||
|
||||
public int? level_id { get; set; }
|
||||
public string level_text { get; set; }
|
||||
|
||||
public decimal? salary { get; set; }
|
||||
|
||||
@@ -30,11 +30,13 @@ namespace TodoAPI2.Models
|
||||
|
||||
public decimal? monthly_remuneration { get; set; }
|
||||
|
||||
public decimal? cost_of_living { get; set; }
|
||||
|
||||
public int? order_of_data { get; set; }
|
||||
|
||||
public Guid? frame_group_guid_eva_limit_frame_group_group_guid { get; set; }
|
||||
public string employee_id_external_linkage_external_name { get; set; }
|
||||
public string org_id_external_linkage_external_name { get; set; }
|
||||
public string position_id_external_linkage_external_name { get; set; }
|
||||
public string level_id_external_linkage_external_name { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -9,8 +9,6 @@ namespace TodoAPI2.Models
|
||||
{
|
||||
public List<external_employeeViewModel> item_employee_id { get; set; }
|
||||
public List<external_linkageViewModel> item_org_id { get; set; }
|
||||
public List<external_linkageViewModel> item_position_id { get; set; }
|
||||
public List<external_linkageViewModel> item_level_id { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user