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

แก้ไข OP 3353,3651

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-11-01 22:03:41 +07:00
parent 916d24b976
commit 2b9500a0d1
8 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs
View File

@@ -130,6 +130,9 @@ namespace TodoAPI2.Models
remark_hrm_work_record = fk_external_employee.remark_hrm_work_record
+ GetWorkTimeText(fk_external_employee.packing_date, endDate),
score1 = fk_eva_create_evaluationResult10.score1,
score2 = fk_eva_create_evaluationResult10.score2,
isActive = m_eva_create_evaluation_detail_agreement.isActive,
Created = m_eva_create_evaluation_detail_agreement.created,
Updated = m_eva_create_evaluation_detail_agreement.updated

4
Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs
View File

@@ -56,6 +56,10 @@ namespace TodoAPI2.Models
public DateTime? status_chief_click_date { get; set; }
public DateTime? status_supervisor_click_date { get; set; }
public decimal? score1 { get; set; }
public decimal? score2 { get; set; }
public string txt_status_self { get { return getStatusText(status_self) + MyHelper.GetDateStringForReport(status_self_click_date); } }
public string txt_status_chief { get { return getStatusText(status_chief) + MyHelper.GetDateStringForReport(status_chief_click_date); } }
public string txt_status_supervisor { get { return getStatusText(status_supervisor) + MyHelper.GetDateStringForReport(status_supervisor_click_date); } }