ปรับปรุงการเรียงลำดับหลายข้อ

2021-04-06 15:25:50 +07:00
parent 4844a0ad44
commit 58cc8018af
5 changed files with 60 additions and 14 deletions
--- a/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
+++ b/Models/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02Service.cs
@@ -142,22 +142,26 @@ namespace TodoAPI2.Models

                join fk_external_linkage2 in all_emp on m_eva_adjust_postponement_detail_quota_02.employee_id equals fk_external_linkage2.id
                into external_linkageResult2
-                from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()
-
-                join sort_dep in ext.GetSortingDep() on fk_external_linkageResult2.department_id equals sort_dep.id
-                into sort_depResult2
-                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
+                from fk_external_linkageResult2 in external_linkageResult2.DefaultIfEmpty()                

                join create_detail in _repository.Context.eva_create_evaluation_detail
                on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_detail.create_evaluation_id
                into create_detailResult
                from fk_create_detailResult in create_detailResult.DefaultIfEmpty()

+                join sort_dep in ext.GetSortingDep() on fk_create_detailResult.help_org_id.HasValue ? fk_create_detailResult.help_org_id : fk_external_linkageResult2.department_id equals sort_dep.id
+                into sort_depResult2
+                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
+
                join create_data in _repository.Context.eva_create_evaluation
                on fk_eva_adjust_postponementResult1A.create_evaluation_id equals create_data.id
                into create_dataResult
                from fk_create_dataResult in create_dataResult.DefaultIfEmpty()

+                join sort_dep2 in ext.GetSortingDep() on fk_create_detailResult.help_org_id equals sort_dep2.id
+                into external_linkageResult11
+                from fk_external_linkageResult11 in sort_depResult2.DefaultIfEmpty()
+
                where 1==1
                //&& (m_eva_adjust_postponement_detail_quota_02.id == model.id || !model.id.HasValue)
                && (m_eva_adjust_postponement_detail_quota_02.adjust_postponement_quota_id == model.adjust_postponement_quota_id || !model.adjust_postponement_quota_id.HasValue)
@@ -165,6 +169,9 @@ namespace TodoAPI2.Models

                orderby
                fk_sort_depResult2.external_code,
+
+                fk_create_detailResult.help_org_id.HasValue ? 1 : 0,
+
                //fk_external_linkageResult2.department_degree_id,
                //fk_external_linkageResult2.department_code,
                fk_external_linkageResult2.hpt_position_type_id,
@@ -190,7 +197,9 @@ namespace TodoAPI2.Models
                    emp_fullname = fk_external_linkageResult2.fullname,
                    emp_position = fk_external_linkageResult2.position_name,
                    emp_level = fk_external_linkageResult2.position_level_text,
-                    emp_department_name = fk_sort_depResult2.external_name,
+
+                    emp_department_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_sort_depResult2.external_name,
+
                    total_score = fk_create_detailResult.score_supervisor,
                    eva_result = fk_create_detailResult.level_score_supervisor,

--- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
+++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs
@@ -254,6 +254,10 @@ namespace TodoAPI2.Models
                into external_employeeResult
                from fk_external_employee in external_employeeResult.DefaultIfEmpty()

+                join sort_dep in ext.GetSortingDep() on m_eva_create_evaluation_detail_agreement.help_org_id.HasValue? m_eva_create_evaluation_detail_agreement.help_org_id : fk_external_employee.department_id equals sort_dep.id
+                into sort_depResult2
+                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()
+
                join fk_external_chief in allemp on m_eva_create_evaluation_detail_agreement.chief equals fk_external_chief.id
                into external_chiefResult
                from fk_external_chief in external_chiefResult.DefaultIfEmpty()
@@ -266,6 +270,10 @@ namespace TodoAPI2.Models
                into planResult
                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
+                into external_linkageResult11
+                from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty()
+
                where 1 == 1
                && (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)
@@ -273,7 +281,16 @@ namespace TodoAPI2.Models
                && (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname))
                && (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id)

-                orderby m_eva_create_evaluation_detail_agreement.created descending
+                orderby
+                fk_sort_depResult2.external_code,
+                //fk_external_employee.department_degree_id,
+                //fk_external_employee.department_code,
+
+                (!string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? 1 : 0),
+
+                fk_external_employee.hpt_position_type_id,
+                fk_external_employee.hpl_position_level_id,
+                fk_external_employee.employee_no
                select new eva_create_evaluation_detail_firstdocViewModel()
                {
                    id = m_eva_create_evaluation_detail_agreement.id,
@@ -296,7 +313,7 @@ namespace TodoAPI2.Models
                    status_chief_a = m_eva_create_evaluation_detail_agreement.status_chief_a,
                    status_supervisor = m_eva_create_evaluation_detail_agreement.status_supervisor,

-                    org_id_external_linkage_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_employee.department_name,

                    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,
--- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
+++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs
@@ -246,7 +246,7 @@ namespace TodoAPI2.Models
                into external_employeeResult
                from fk_external_employee in external_employeeResult.DefaultIfEmpty()

-                join sort_dep in ext.GetSortingDep() on fk_external_employee.department_id equals sort_dep.id
+                join sort_dep in ext.GetSortingDep() on m_eva_create_evaluation_detail_process.help_org_id.HasValue ? m_eva_create_evaluation_detail_process.help_org_id : fk_external_employee.department_id equals sort_dep.id
                into sort_depResult2
                from fk_sort_depResult2 in sort_depResult2.DefaultIfEmpty()

@@ -262,6 +262,10 @@ namespace TodoAPI2.Models
                into planResult
                from fk_planResult in planResult.DefaultIfEmpty()

+                join fk_external_linkage11 in ext.GetDepartmentData() on m_eva_create_evaluation_detail_process.help_org_id equals fk_external_linkage11.id
+                into external_linkageResult11
+                from fk_external_linkageResult11 in external_linkageResult11.DefaultIfEmpty()
+
                where 1 == 1
                && (m_eva_create_evaluation_detail_process.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue)
                && (all_org_id.Contains(fk_external_employee.department_id) || !model.org_id.HasValue)
@@ -301,7 +305,7 @@ namespace TodoAPI2.Models
                    search_employee_code = fk_external_employee.employee_no,
                    search_employee_fullname = fk_external_employee.fullname,

-                    org_id_external_linkage_external_name = fk_sort_depResult2.external_name,
+                    org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_employee.department_name,

                    status_self = m_eva_create_evaluation_detail_process.status_self,
                    status_chief = m_eva_create_evaluation_detail_process.status_chief,
--- a/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
+++ b/Models/eva_limit_frame_employee/eva_limit_frame_employeeService.cs
@@ -156,7 +156,7 @@ namespace TodoAPI2.Models

                    frame_group_guid_eva_limit_frame_group_group_guid = fk_eva_limit_frame_groupResult1.group_guid,
                    employee_id_external_linkage_external_name = fk_external_linkageResult2.fullname,
-                    org_id_external_linkage_external_name = fk_external_linkageResult3.external_name,
+                    org_id_external_linkage_external_name = !string.IsNullOrEmpty(fk_external_linkageResult11.external_name) ? fk_external_linkageResult11.external_name : fk_external_linkageResult3.external_name,
                    help_org_id_external_linkage_external_name = fk_external_linkageResult11.external_name,

                    isActive = m_eva_limit_frame_employee.isActive,
--- a/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js
+++ b/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js
@@ -177,7 +177,7 @@ function eva_create_evaluation_detail_firstdoc_GoDelete(a) {
 var eva_create_evaluation_detail_firstdocTableV;

 var eva_create_evaluation_detail_firstdoc_setupTable = function (result) {
-    console.log(result);
+    var groupColumn = 6;

    tmp = '"';
    eva_create_evaluation_detail_firstdocTableV = $('#eva_create_evaluation_detail_firstdocTable').DataTable({
@@ -205,13 +205,29 @@ var eva_create_evaluation_detail_firstdoc_setupTable = function (result) {
                "render": function (data, type, row, meta) {
                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_firstdoc_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
                }
-            }
+            },
+            { "visible": false, "targets": groupColumn }
        ],
        "language": {
            "url": appsite + "/DataTables-1.10.16/thai.json"
        },
        "paging": true,
-        "searching": false
+        "searching": false,
+        "drawCallback": function (settings) {
+            var api = this.api();
+            var rows = api.rows({ page: 'current' }).nodes();
+            var last = null;
+
+            api.column(groupColumn, { page: 'current' }).data().each(function (group, i) {
+                if (last !== group) {
+                    $(rows).eq(i).before(
+                        '<tr class="group"><td colspan="12">' + group + '</td></tr>'
+                    );
+
+                    last = group;
+                }
+            });
+        }
    });
    endLoad();
 };