diff --git a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml index ce52bd4..904a0be 100644 --- a/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml +++ b/modules/bmw/src/main/resources/mapper/person/FaceContrastNewMapper.xml @@ -40,7 +40,7 @@ AND bs.id = #{params.subId} LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1' - Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1 + Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1' LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' AND bw.worker_type = #{params.workerType} @@ -257,7 +257,7 @@ AND bs.id = #{params.subId} LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1' - Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1 + Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1' LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' AND bw.worker_type = #{params.workerType} @@ -319,7 +319,7 @@ AND bs.id = #{params.subId} LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1' - Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1 + Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1' LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' AND bw.worker_type = #{params.workerType} @@ -632,7 +632,7 @@ AND bsc.is_active = '1' LEFT JOIN bm_sub_team bst on bsc.sub_id = bst.sub_id and bst.is_active = '1' - Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.exit_time is null and bweh.exit_status = -1 + Left Join bm_worker_ein_history bweh on bweh.team_id = bst.id and bweh.project_id = bp.id and bweh.is_furlough_person = '0' and bweh.exit_status != '1' LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1' AND bw.worker_type = #{params.workerType}