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

ปรับปรุง flow การไหล ของข้อมูล

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-03-13 10:19:57 +07:00
parent c334d7a9dd
commit 1c2857e977
17 changed files with 203 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -104,6 +104,9 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail_process.status_chief,
status_supervisor = m_eva_create_evaluation_detail_process.status_supervisor,
status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A,
role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
m_eva_create_evaluation_detail_process.chief,
fk_eva_create_evaluationResult10.employee_id,
@@ -208,6 +211,9 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail_process.status_chief,
status_supervisor = m_eva_create_evaluation_detail_process.status_supervisor,
status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A,
role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief,
m_eva_create_evaluation_detail_process.chief,
fk_eva_create_evaluationResult10.employee_id,

4
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs
View File

@@ -49,6 +49,10 @@ namespace TodoAPI2.Models
public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; }
public string status_supervisor2A { get; set; }
public string role_desc { get; set; }
public string role_code { get; set; }

4
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs
View File

@@ -24,6 +24,10 @@ namespace TodoAPI2.Models
public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; }
public string status_supervisor2A { get; set; }
public string active_mode { get; set; }
}
}

7
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs
View File

@@ -102,6 +102,8 @@ namespace TodoAPI2.Models
status_chief = m_eva_create_evaluation_detail_status.status_chief,
status_supervisor = m_eva_create_evaluation_detail_status.status_supervisor,
status_supervisor1A = m_eva_create_evaluation_detail_status.status_supervisor1A,
status_supervisor2A = m_eva_create_evaluation_detail_status.status_supervisor2A,
isActive = m_eva_create_evaluation_detail_status.isActive,
Created = m_eva_create_evaluation_detail_status.created,
@@ -153,7 +155,8 @@ namespace TodoAPI2.Models
existingEntity.status_self = model.status_self;
existingEntity.status_chief = model.status_chief;
existingEntity.status_supervisor = model.status_supervisor;
existingEntity.status_supervisor1A = model.status_supervisor1A;
existingEntity.status_supervisor2A = model.status_supervisor2A;
var updated = _repository.Update(id, existingEntity);
return Get(updated.id);
@@ -175,6 +178,8 @@ namespace TodoAPI2.Models
existingEntity.status_self = i.status_self;
existingEntity.status_chief = i.status_chief;
existingEntity.status_supervisor = i.status_supervisor;
existingEntity.status_supervisor1A = i.status_supervisor1A;
existingEntity.status_supervisor2A = i.status_supervisor2A;
_repository.UpdateWithoutCommit(i.id.Value, existingEntity);

5
Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs
View File

@@ -22,6 +22,9 @@ namespace TodoAPI2.Models
public string status_supervisor { get; set; }
public string status_supervisor1A { get; set; }
public string status_supervisor2A { get; set; }
}
}
}

2
Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs
View File

@@ -97,7 +97,7 @@ namespace TodoAPI2.Models
&& (m_eva_evaluation_achievement_process2.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue)
orderby m_eva_evaluation_achievement_process2.created descending
orderby m_eva_evaluation_achievement_process2.achievement
select new eva_evaluation_achievement_process2ViewModel()
{
id = m_eva_evaluation_achievement_process2.id,

2
Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs
View File

@@ -97,7 +97,7 @@ namespace TodoAPI2.Models
&& (m_eva_evaluation_behavior_process2.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue)
orderby m_eva_evaluation_behavior_process2.created descending
orderby m_eva_evaluation_behavior_process2.behavior
select new eva_evaluation_behavior_process2ViewModel()
{
id = m_eva_evaluation_behavior_process2.id,