考勤模块入场判断修改
This commit is contained in:
parent
7f2fdd3c85
commit
1881165162
|
|
@ -40,7 +40,7 @@
|
||||||
AND bs.id = #{params.subId}
|
AND bs.id = #{params.subId}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
|
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'
|
LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
|
||||||
<if test="params.workerType != null and params.workerType !='' ">
|
<if test="params.workerType != null and params.workerType !='' ">
|
||||||
AND bw.worker_type = #{params.workerType}
|
AND bw.worker_type = #{params.workerType}
|
||||||
|
|
@ -257,7 +257,7 @@
|
||||||
AND bs.id = #{params.subId}
|
AND bs.id = #{params.subId}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
|
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'
|
LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
|
||||||
<if test="params.workerType != null and params.workerType !='' ">
|
<if test="params.workerType != null and params.workerType !='' ">
|
||||||
AND bw.worker_type = #{params.workerType}
|
AND bw.worker_type = #{params.workerType}
|
||||||
|
|
@ -319,7 +319,7 @@
|
||||||
AND bs.id = #{params.subId}
|
AND bs.id = #{params.subId}
|
||||||
</if>
|
</if>
|
||||||
LEFT JOIN bm_sub_team bst on bs.id = bst.sub_id and bs.is_active = '1'
|
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'
|
LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
|
||||||
<if test="params.workerType != null and params.workerType !='' ">
|
<if test="params.workerType != null and params.workerType !='' ">
|
||||||
AND bw.worker_type = #{params.workerType}
|
AND bw.worker_type = #{params.workerType}
|
||||||
|
|
@ -632,7 +632,7 @@
|
||||||
</if>
|
</if>
|
||||||
AND bsc.is_active = '1'
|
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_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'
|
LEFT JOIN bm_worker bw ON bw.ID_NUMBER = bweh.ID_NUMBER and bw.is_active = '1'
|
||||||
<if test="params.workerType != null and params.workerType !='' ">
|
<if test="params.workerType != null and params.workerType !='' ">
|
||||||
AND bw.worker_type = #{params.workerType}
|
AND bw.worker_type = #{params.workerType}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue