From 50d6cc4d9a53cb345c8a9208eaedd8cd01f87576 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 2 Mar 2023 14:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9C=9F=E7=B4=AF=E8=AE=A1=E6=83=85?= =?UTF-8?q?=E5=86=B5=EF=BC=8C=E6=8C=89=E7=85=A7=E7=A8=8E=E6=AC=BE=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E6=9C=9F=E6=9C=88=E4=BB=BD=E8=BF=9B=E8=A1=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/AddUpSituationMapper.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml index beaf22bbe..f41eefa7d 100644 --- a/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/AddUpSituationMapper.xml @@ -322,9 +322,9 @@ FROM hrsa_add_up_situation t1 - INNER JOIN - (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON - t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month +-- INNER JOIN +-- (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON +-- t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id @@ -346,9 +346,9 @@ FROM hrsa_add_up_situation t1 - INNER JOIN - (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON - t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month +-- INNER JOIN +-- (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON +-- t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id @@ -370,9 +370,9 @@ FROM hrsa_add_up_situation t1 - INNER JOIN - (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON - t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month +-- INNER JOIN +-- (SELECT employee_id, MAX(tax_year_month) tax_year_month FROM hrsa_add_up_situation WHERE delete_type = 0 GROUP BY employee_id) t ON +-- t.employee_id = t1.employee_id AND t.tax_year_month = t1.tax_year_month LEFT JOIN hrmresource e ON e.id = t1.employee_id LEFT JOIN hrmdepartment d ON d.id = e.departmentid LEFT JOIN hrsa_tax_agent t2 ON t1.tax_agent_id = t2.id