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

รวม code แก้ไขหลายจุด

Browse Source
This commit is contained in:
Nakorn Rientrakrunchai
2020-08-16 10:08:59 +07:00
parent e5b3a20670
commit 592a3e3c1b
8 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Models/external_linkage/external_linkageService.cs
View File

@@ -429,7 +429,8 @@ left join public.{0}DepartmentData{0} orgdata2 on orgdata2.id = detail.parent_de
left join public.org_type_departments as org_type_depart on orgdata.department_type_id = org_type_depart.id
left join public.org_type_department_colors as org_depart_color
on org_type_depart.department_degree_id = org_depart_color.id
where orgdata.department_name is not null
where orgdata.department_name is not null
and orgdata.deleted_at is null and orgdata2.deleted_at is null
order by case
when org_type_depart.department_degree_id = 1 then orgdata.department_code::int*1000
when detail.parent_department_id is not null and detail.parent_department_id>0

4
Models/rep_eva01/rep_eva01Service.cs
View File

@@ -57,7 +57,7 @@ namespace TodoAPI2.Models
{
var entity = _repository.Get(id);
var i = Mapper.Map<rep_eva01WithSelectionViewModel>(entity);
i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList();
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
i.item_round_id = (from x in ext.GetEvaRound() select x).ToList();
@@ -66,7 +66,7 @@ namespace TodoAPI2.Models
public rep_eva01WithSelectionViewModel GetBlankItem()
{
var i = new rep_eva01WithSelectionViewModel();
i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList();
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
i.item_round_id = (from x in ext.GetEvaRound() select x).ToList();

4
Models/rep_eva02/rep_eva02Service.cs
View File

@@ -57,7 +57,7 @@ namespace TodoAPI2.Models
{
var entity = _repository.Get(id);
var i = Mapper.Map<rep_eva02WithSelectionViewModel>(entity);
i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList();
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
i.item_round_id = (from x in ext.GetEvaRound() select x).ToList();
@@ -66,7 +66,7 @@ namespace TodoAPI2.Models
public rep_eva02WithSelectionViewModel GetBlankItem()
{
var i = new rep_eva02WithSelectionViewModel();
i.item_org_id = (from x in ext.GetDepartmentDataForReport() select x).ToList();
i.item_org_id = (from x in ext.GetSortingDep() select x).ToList();
i.item_round_id = (from x in ext.GetEvaRound() select x).ToList();