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

update code

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2021-03-03 12:28:50 +07:00
parent ad14f4f664
commit 23e68366bb
43 changed files with 2650 additions and 777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Models/eva_limit_frame_employee/eva_limit_frame_employeeEntity.cs
View File

@@ -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)
{

8
Models/eva_limit_frame_employee/eva_limit_frame_employeeInputModel.cs
View File

@@ -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; }
}
}

51
Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
View File

@@ -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
}
}
}

10
Models/eva_limit_frame_employee/eva_limit_frame_employeeViewModel.cs
View File

@@ -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; }
}
}

2
Models/eva_limit_frame_employee/eva_limit_frame_employeeWithSelectionViewModel.cs
View File

@@ -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; }
}
}

3
Models/eva_limit_frame_group/eva_limit_frame_groupEntity.cs
View File

@@ -32,6 +32,9 @@ namespace TodoAPI2.Models
public decimal? total_salary_limit_rounded { get; set; }
[MaxLength(4000)]
public string remark { get; set; }
public void SetAutoField(DataContext context)
{

2
Models/eva_limit_frame_group/eva_limit_frame_groupInputModel.cs
View File

@@ -28,6 +28,8 @@ namespace TodoAPI2.Models
public decimal? total_salary_limit_rounded { get; set; }
public string remark { get; set; }
public string active_mode { get; set; }
}
}

6
Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
View File

@@ -127,6 +127,7 @@ namespace TodoAPI2.Models
total_salary = m_eva_limit_frame_group.total_salary,
total_salary_limit = m_eva_limit_frame_group.total_salary_limit,
total_salary_limit_rounded = m_eva_limit_frame_group.total_salary_limit_rounded,
remark = m_eva_limit_frame_group.remark,
frame_plan_guid_eva_limit_frame_plan_executed_date = fk_eva_limit_frame_planResult1.executed_date,
group_guid_eva_evaluation_group_code = fk_eva_evaluation_groupResult2.code,
@@ -179,6 +180,7 @@ namespace TodoAPI2.Models
existingEntity.total_salary = model.total_salary;
existingEntity.total_salary_limit = model.total_salary_limit;
existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
existingEntity.remark = model.remark;
existingEntity.SetAutoField(_repository.Context);
@@ -214,6 +216,7 @@ namespace TodoAPI2.Models
existingEntity.total_salary = i.total_salary;
existingEntity.total_salary_limit = i.total_salary_limit;
existingEntity.total_salary_limit_rounded = i.total_salary_limit_rounded;
existingEntity.remark = i.remark;
existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
@@ -285,7 +288,8 @@ namespace TodoAPI2.Models
i.Add("limit_frame_295", "กรอบวงเงินที่กันไว้");
i.Add("total_salary", "อัตราเงินเดือนรวม");
i.Add("total_salary_limit", "วงเงินในการเลื่อนเงินเดือน");
i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง");
i.Add("total_salary_limit_rounded", "วงเงินในการเลื่อนเงินเดือน ที่ใช้จริง");
i.Add("remark", "หมายเหตุ");
return i;
}

2
Models/eva_limit_frame_group/eva_limit_frame_groupViewModel.cs
View File

@@ -26,6 +26,8 @@ namespace TodoAPI2.Models
public decimal? total_salary_limit_rounded { get; set; }
public string remark { get; set; }
public DateTime? frame_plan_guid_eva_limit_frame_plan_executed_date { get; set; }
public string group_guid_eva_evaluation_group_code { get; set; }

4
Models/eva_limit_frame_plan/eva_limit_frame_planEntity.cs
View File

@@ -42,6 +42,10 @@ namespace TodoAPI2.Models
public DateTime? salary_adjustment_date { get; set; }
public decimal? limit_frame_005_total { get; set; }
public decimal? limit_frame_005_total_rounded { get; set; }
public void SetAutoField(DataContext context)
{

4
Models/eva_limit_frame_plan/eva_limit_frame_planInputModel.cs
View File

@@ -36,6 +36,10 @@ namespace TodoAPI2.Models
public DateTime? salary_adjustment_date { get; set; }
public decimal? limit_frame_005_total { get; set; }
public decimal? limit_frame_005_total_rounded { get; set; }
public string active_mode { get; set; }
}
}

27
Models/eva_limit_frame_plan/eva_limit_frame_planService.cs
View File

@@ -77,7 +77,7 @@ namespace TodoAPI2.Models
var entity = _repository.Get(id);
var i = Mapper.Map<eva_limit_frame_planWithSelectionViewModel>(entity);
i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
//i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList();
i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList();
return i;
@@ -86,7 +86,7 @@ namespace TodoAPI2.Models
{
var i = new eva_limit_frame_planWithSelectionViewModel();
i.item_plan_guid = (from x in _repository.Context.eva_performance_plan select x).ToList();
//i.item_supervisor1_result = (from x in ext.GetDemoItem() select x).ToList();
i.item_supervisor1_result = (from x in ext.GetYesNo() select x).ToList();
return i;
@@ -108,9 +108,9 @@ namespace TodoAPI2.Models
into eva_performance_planResult1
from fk_eva_performance_planResult1 in eva_performance_planResult1.DefaultIfEmpty()
//join fk_external_linkage7 in ext.GetDemoItem() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code
//into external_linkageResult7
//from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
join fk_external_linkage7 in ext.GetYesNo() on m_eva_limit_frame_plan.supervisor1_result equals fk_external_linkage7.external_code
into external_linkageResult7
from fk_external_linkageResult7 in external_linkageResult7.DefaultIfEmpty()
where
@@ -132,9 +132,11 @@ namespace TodoAPI2.Models
supervisor1_remark = m_eva_limit_frame_plan.supervisor1_remark,
supervisor1_date = m_eva_limit_frame_plan.supervisor1_date,
salary_adjustment_date = m_eva_limit_frame_plan.salary_adjustment_date,
limit_frame_005_total = m_eva_limit_frame_plan.limit_frame_005_total,
limit_frame_005_total_rounded = m_eva_limit_frame_plan.limit_frame_005_total_rounded,
plan_guid_eva_performance_plan_fiscal_year = fk_eva_performance_planResult1.fiscal_year,
//supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name,
supervisor1_result_external_linkage_external_name = fk_external_linkageResult7.external_name,
isActive = m_eva_limit_frame_plan.isActive,
Created = m_eva_limit_frame_plan.created,
@@ -188,8 +190,10 @@ namespace TodoAPI2.Models
existingEntity.supervisor1_remark = model.supervisor1_remark;
existingEntity.supervisor1_date = model.supervisor1_date;
existingEntity.salary_adjustment_date = model.salary_adjustment_date;
existingEntity.limit_frame_005_total = model.limit_frame_005_total;
existingEntity.limit_frame_005_total_rounded = model.limit_frame_005_total_rounded;
existingEntity.SetAutoField(_repository.Context);
existingEntity.SetAutoField(_repository.Context);
if (is_force_save)
{
@@ -226,9 +230,11 @@ namespace TodoAPI2.Models
existingEntity.supervisor1_result = i.supervisor1_result;
existingEntity.supervisor1_remark = i.supervisor1_remark;
existingEntity.supervisor1_date = i.supervisor1_date;
existingEntity.salary_adjustment_date = i.salary_adjustment_date;
existingEntity.salary_adjustment_date = i.salary_adjustment_date;
existingEntity.limit_frame_005_total = i.limit_frame_005_total;
existingEntity.limit_frame_005_total_rounded = i.limit_frame_005_total_rounded;
existingEntity.SetAutoField(_repository.Context);
existingEntity.SetAutoField(_repository.Context);
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);
}
}
@@ -304,7 +310,10 @@ namespace TodoAPI2.Models
i.Add("supervisor1_remark", "ความเห็นผู้ประเมิน");
i.Add("supervisor1_date", "วันที่ประเมิน");
i.Add("txt_supervisor1_date", "วันที่ประเมิน");
i.Add("salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
i.Add("txt_salary_adjustment_date", "เลื่อนเงินเดือนวันที่");
i.Add("limit_frame_005_total", "กันวงเงินไว้");
i.Add("limit_frame_005_total_rounded", "กันวงเงินใช้จริง");
return i;
}

4
Models/eva_limit_frame_plan/eva_limit_frame_planViewModel.cs
View File

@@ -40,6 +40,10 @@ namespace TodoAPI2.Models
public string txt_salary_adjustment_date { get { return MyHelper.GetDateStringForReport(this.salary_adjustment_date); } }
public decimal? limit_frame_005_total { get; set; }
public decimal? limit_frame_005_total_rounded { get; set; }
public int? plan_guid_eva_performance_plan_fiscal_year { get; set; }
public string supervisor1_result_external_linkage_external_name { get; set; }