From 7f2fdd3c859231ff06868585b79a01959aca3463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= Date: Mon, 9 Feb 2026 11:19:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=A1=A8=E6=A8=A1=E5=9D=97SQ?= =?UTF-8?q?L=E9=87=8D=E6=96=B0=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/homePage/HomePageMapper.xml | 4 +-- .../planAndRealName/PlanAndRealNameMapper.xml | 29 +++++++------------ 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml b/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml index bdeba03..9bb49da 100644 --- a/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml +++ b/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml @@ -635,8 +635,8 @@ LEFT JOIN bm_project bp ON bp.id = a.project_id WHERE ein_time <= DATE_SUB(CURDATE(), INTERVAL 7 DAY) - AND exit_time IS NULL - AND exit_status = - 1 + and is_furlough_person = '0' + and exit_status != '1' AND bp.project_general_id = #{subComId} diff --git a/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml b/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml index 134492e..ccad2c2 100644 --- a/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml +++ b/modules/bmw/src/main/resources/mapper/planAndRealName/PlanAndRealNameMapper.xml @@ -27,8 +27,8 @@ LEFT JOIN bm_project bp ON bp.two_com_id = pm.id and bp.is_active = '1' and bp.pro_status = 0 LEFT JOIN bm_sub_contract bsc ON bsc.pro_id = bp.id and bsc.is_active = '1' LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr on bsr.sub_contract_id = bsc.id and bsr.type = '3' and bsr.is_active = '1' - LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` and btur.is_active = '1' + LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bst.is_active = 1 + LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.`id` and btur.is_active = '1' LEFT JOIN (select id_number,project_id FROM bm_worker_ein_history WHERE is_active = '1' and is_furlough_person = '0' and exit_status != '1' GROUP BY id_number)bweh ON bweh.project_id = bp.ID LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' and bw.ein_status = 1 GROUP BY @@ -61,8 +61,8 @@ LEFT JOIN bm_project bp ON bp.two_com_id = pm.id and bp.is_active = '1' and bp.pro_status = 0 LEFT JOIN bm_sub_contract bsc ON bsc.pro_id = bp.id and bsc.is_active = '1' LEFT JOIN bm_subcontractor bs on bs.id = bsc.sub_id and bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr on bsr.sub_contract_id = bsc.id and bsr.type = '3' and bsr.is_active = '1' - LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` and btur.is_active = '1' + LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bst.is_active = 1 + LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.`id` and btur.is_active = '1' LEFT JOIN (select id_number,project_id FROM bm_worker_ein_history WHERE is_active = '1' and is_furlough_person = '0' and exit_status != '1' GROUP BY id_number)bweh ON bweh.project_id = bp.ID LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' and bw.ein_status = 1 GROUP BY @@ -191,10 +191,7 @@ AND bsc.is_active = '1' LEFT JOIN bm_subcontractor bs ON bs.id = bsc.sub_id AND bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id - AND bsr.type = '3' - AND bsr.is_active = '1' - LEFT JOIN bm_sub_team bst ON bsr.v = bst.id + LEFT JOIN bm_sub_team bst ON bs.id = bst.sub_id AND bst.is_active = '1' LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id AND btur.is_active = '1' @@ -286,10 +283,8 @@ AND bsc.is_active = '1' LEFT JOIN bm_subcontractor bs ON bs.id = bsc.sub_id AND bs.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id - AND bsr.type = '3' - AND bsr.is_active = '1' - LEFT JOIN bm_team_user_relation btur ON btur.team_id = bsr.`value` + left join bm_sub_team bst on bst.sub_id = bs.id and bst.is_active = 1 + LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id AND btur.is_active = '1' LEFT JOIN ( SELECT * FROM bm_worker_ein_history WHERE is_active = '1' AND is_furlough_person = '0' AND exit_status != '1' GROUP BY id_number ) bweh ON bweh.ID_NUMBER = btur.id_number @@ -334,14 +329,12 @@ LEFT JOIN bm_sub_contract bsc ON bsc.pro_id = bp.id AND bsc.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bsc.id - AND bsr.type = '3' - AND bsr.is_active = '1' + LEFT JOIN bm_sub_team bst on bsc.sub_id = bst.sub_id and bst.is_active = 1 LEFT JOIN ( SELECT id_number, project_id, sub_id, team_id FROM bm_worker_ein_history WHERE is_active = '1' AND is_furlough_person = '0' AND exit_status != '1' GROUP BY id_number ) bweh on bweh.project_id = bsc.pro_id AND bweh.sub_id = bsc.sub_id - and bsr.v = bweh.team_id + and bst.id = bweh.team_id LEFT JOIN ( SELECT id_number, pro_id FROM fc_face_contrast WHERE CURRENT_DAY = #{params.currentDay} GROUP BY id_number, CURRENT_DAY, pro_id ) ffc ON ffc.pro_id = bweh.project_id AND bweh.id_number = ffc.id_number @@ -404,9 +397,7 @@ AND bp.IS_ACTIVE = '1' LEFT JOIN bm_project_general po ON po.id = bp.project_general_id AND po.is_active = '1' - LEFT JOIN bm_sub_relation bsr ON bsr.sub_contract_id = bwc.id - AND bsr.is_active = '1' - LEFT JOIN bm_sub_team bst ON bsr.v = bst.id + LEFT JOIN bm_sub_team bst ON bs.id = bst.sub_id AND bst.IS_ACTIVE = '1' LEFT JOIN bm_team_user_relation btur ON btur.team_id = bst.id AND btur.IS_ACTIVE = '1'