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

แก้บัก รายงานประวัติเงินเดือน กรณี record ไม่สมบูรณ์

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-04-07 22:40:23 +07:00
parent 4623ca3ff3
commit c408b8aa29
2 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApiControllers/rep_eva_self_reviewControllers.cs
View File

@@ -149,10 +149,17 @@ namespace TodoAPI2.Controllers
string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password");
var temp = (from x in _repository.GetContext().eva_adjust_postponement_detail var temp = (from x in _repository.GetContext().eva_adjust_postponement_detail
join y in _repository.GetContext().eva_adjust_postponement
on x.adjust_postponement_id equals y.id join fk_eva_adjust_postponement1 in _repository.GetContext().eva_adjust_postponement on x.adjust_postponement_id equals fk_eva_adjust_postponement1.id
into eva_adjust_postponementResult1
from fk_eva_adjust_postponementResult1 in eva_adjust_postponementResult1.DefaultIfEmpty()
join fk_eva_adjust_postponement2 in _repository.GetContext().eva_adjust_postponement on x.adjust_postponement_quota_id equals fk_eva_adjust_postponement2.id
into eva_adjust_postponementResult2
from fk_eva_adjust_postponementResult2 in eva_adjust_postponementResult2.DefaultIfEmpty()
where x.id == model.detail_id where x.id == model.detail_id
select y).FirstOrDefault(); select fk_eva_adjust_postponementResult1 == null? fk_eva_adjust_postponementResult1 : fk_eva_adjust_postponementResult2).FirstOrDefault();
if (temp != null) if (temp != null)
{ {
model.theround = temp.theRound.ToString(); model.theround = temp.theRound.ToString();
@@ -160,6 +167,7 @@ namespace TodoAPI2.Controllers
var all_eva = (from x in _repository.GetContext().eva_performance_plan var all_eva = (from x in _repository.GetContext().eva_performance_plan
where x.fiscal_year == temp.fiscal_year where x.fiscal_year == temp.fiscal_year
&& x.theTime == temp.theRound
orderby x.theTime orderby x.theTime
select x).ToList(); select x).ToList();
foreach (var x2 in all_eva) foreach (var x2 in all_eva)
@@ -207,10 +215,17 @@ namespace TodoAPI2.Controllers
string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password");
var temp = (from x in _repository.GetContext().eva_adjust_postponement_detail var temp = (from x in _repository.GetContext().eva_adjust_postponement_detail
join y in _repository.GetContext().eva_adjust_postponement
on x.adjust_postponement_id equals y.id join fk_eva_adjust_postponement1 in _repository.GetContext().eva_adjust_postponement on x.adjust_postponement_id equals fk_eva_adjust_postponement1.id
into eva_adjust_postponementResult1
from fk_eva_adjust_postponementResult1 in eva_adjust_postponementResult1.DefaultIfEmpty()
join fk_eva_adjust_postponement2 in _repository.GetContext().eva_adjust_postponement on x.adjust_postponement_quota_id equals fk_eva_adjust_postponement2.id
into eva_adjust_postponementResult2
from fk_eva_adjust_postponementResult2 in eva_adjust_postponementResult2.DefaultIfEmpty()
where x.id == model.detail_id where x.id == model.detail_id
select y).FirstOrDefault(); select fk_eva_adjust_postponementResult1 == null ? fk_eva_adjust_postponementResult1 : fk_eva_adjust_postponementResult2).FirstOrDefault();
if (temp != null) if (temp != null)
{ {
model.theround = temp.theRound.ToString(); model.theround = temp.theRound.ToString();
@@ -218,6 +233,7 @@ namespace TodoAPI2.Controllers
var all_eva = (from x in _repository.GetContext().eva_performance_plan var all_eva = (from x in _repository.GetContext().eva_performance_plan
where x.fiscal_year == temp.fiscal_year where x.fiscal_year == temp.fiscal_year
&& x.theTime == temp.theRound
orderby x.theTime orderby x.theTime
select x).ToList(); select x).ToList();
foreach (var x2 in all_eva) foreach (var x2 in all_eva)

12
Models/eva_self_review/eva_self_reviewService.cs
View File

@@ -154,13 +154,13 @@ namespace TodoAPI2.Models
adjust_postponement_id = m_eva_self_review.adjust_postponement_id, adjust_postponement_id = m_eva_self_review.adjust_postponement_id,
adjust_postponement_quota_id = m_eva_self_review.adjust_postponement_quota_id, adjust_postponement_quota_id = m_eva_self_review.adjust_postponement_quota_id,
employee_id = m_eva_self_review.employee_id, employee_id = m_eva_self_review.employee_id,
eva_year = fk_eva_adjust_postponementResult1.fiscal_year, eva_year = fk_eva_adjust_postponementResult1.fiscal_year.HasValue? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year,
eva_no = fk_eva_adjust_postponementResult1.theRound, eva_no = fk_eva_adjust_postponementResult1.theRound.HasValue? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound,
adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year, adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year.HasValue ? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year,
adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year, adjust_postponement_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.theRound.HasValue ? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound,
eva_year_external_linkage_external_name = fk_eva_adjust_postponementResult1.fiscal_year.ToString(), eva_year_external_linkage_external_name = (fk_eva_adjust_postponementResult1.fiscal_year.HasValue ? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year).ToString(),
eva_no_external_linkage_external_name = fk_eva_adjust_postponementResult1.theRound.ToString(), eva_no_external_linkage_external_name = (fk_eva_adjust_postponementResult1.theRound.HasValue ? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound).ToString(),
isActive = m_eva_self_review.isActive, isActive = m_eva_self_review.isActive,
Created = m_eva_self_review.created, Created = m_eva_self_review.created,