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

แก้ไข https://app.clickup.com/t/7hzjan และ https://app.clickup.com/t/71uwkz

Browse Source
This commit is contained in:
LAPTOP-KB8JC2K2\acer
2021-08-23 17:34:55 +07:00
parent 5747602eb5
commit a5664503f0
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
View File

@@ -246,6 +246,7 @@ namespace TodoAPI2.Models
public List<eva_create_evaluation_detail_firstdocViewModel> GetListBySearch(eva_create_evaluation_detail_firstdocSearchModel model, int? emp_id) public List<eva_create_evaluation_detail_firstdocViewModel> GetListBySearch(eva_create_evaluation_detail_firstdocSearchModel model, int? emp_id)
{ {
var allemp = emp.GetListByemployee_type(null, null); var allemp = emp.GetListByemployee_type(null, null);
var dept = ext.GetDepartmentData();
var data = ( var data = (
from m_eva_create_evaluation_detail_agreement in _repository.Context.eva_create_evaluation_detail from m_eva_create_evaluation_detail_agreement in _repository.Context.eva_create_evaluation_detail
@@ -270,10 +271,14 @@ namespace TodoAPI2.Models
into planResult into planResult
from fk_planResult in planResult.DefaultIfEmpty() from fk_planResult in planResult.DefaultIfEmpty()
join fk_external_linkage11 in ext.GetDepartmentData() on m_eva_create_evaluation_detail_agreement.help_org_id equals fk_external_linkage11.id join fk_external_linkage11 in dept on m_eva_create_evaluation_detail_agreement.help_org_id equals fk_external_linkage11.id
into external_linkageResult11 into external_linkageResult11
from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty() from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty()
join fk_external_linkage12 in dept on fk_external_employee.department_id equals fk_external_linkage12.id
into external_linkageResult12
from fk_external_linkageResult12 in external_linkageResult12.DefaultIfEmpty()
where 1 == 1 where 1 == 1
&& (m_eva_create_evaluation_detail_agreement.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue) && (m_eva_create_evaluation_detail_agreement.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
&& (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue) && (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue)
@@ -313,7 +318,7 @@ namespace TodoAPI2.Models
status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a, status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor, status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,
org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_employee.department_name, org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_linkageResult12.external_name,
status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date, status_self_click_date = m_eva_create_evaluation_detail_agreement.status_self_click_date,
status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date, status_chief_click_date = m_eva_create_evaluation_detail_agreement.status_chief_click_date,

2
Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
View File

@@ -208,7 +208,7 @@ namespace TodoAPI2.Models
{ {
var i = new eva_create_evaluation_detail_processWithSelectionViewModel(); var i = new eva_create_evaluation_detail_processWithSelectionViewModel();
i.item_org_id = ext.GetDepartmentData(); i.item_org_id = ext.GetDepartmentData();
i.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList(); i.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 && x.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" select x).ToList();
//i.item_level_score = (from j in _repository.Context.eva_level_score //i.item_level_score = (from j in _repository.Context.eva_level_score
// orderby j.min_score // orderby j.min_score
// select Mapper.Map<eva_level_scoreViewModel>(i)).ToList(); // select Mapper.Map<eva_level_scoreViewModel>(i)).ToList();