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

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_quota_id = m_eva_self_review.adjust_postponement_quota_id,
employee_id = m_eva_self_review.employee_id,
eva_year = fk_eva_adjust_postponementResult1.fiscal_year,
eva_no = fk_eva_adjust_postponementResult1.theRound,
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.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_quota_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult2.fiscal_year,
eva_year_external_linkage_external_name = fk_eva_adjust_postponementResult1.fiscal_year.ToString(),
eva_no_external_linkage_external_name = fk_eva_adjust_postponementResult1.theRound.ToString(),
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_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.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.HasValue ? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound).ToString(),
isActive = m_eva_self_review.isActive,
Created = m_eva_self_review.created,