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

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