parent
703bb79cc1
commit
32eaee2930
|
|
@ -84,7 +84,7 @@
|
||||||
WHERE
|
WHERE
|
||||||
pw.is_active = 1
|
pw.is_active = 1
|
||||||
<if test="name != null and name != ''">
|
<if test="name != null and name != ''">
|
||||||
AND pw.`name` LIKE CONCAT('%',#{name},'%')
|
AND (pw.`name` LIKE CONCAT('%',#{name},'%') or pw.`id` = #{name})
|
||||||
</if>
|
</if>
|
||||||
<if test="idNumber != null and idNumber != ''">
|
<if test="idNumber != null and idNumber != ''">
|
||||||
AND pw.id_number LIKE CONCAT('%',#{idNumber},'%')
|
AND pw.id_number LIKE CONCAT('%',#{idNumber},'%')
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@
|
||||||
select bwc.id,bwc.contract_code,bwc.contract_term_type,bwc.is_active,bwc.contract_start_date,
|
select bwc.id,bwc.contract_code,bwc.contract_term_type,bwc.is_active,bwc.contract_start_date,
|
||||||
bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.create_time
|
bwc.contract_stop_date,bwc.wage_approved_way,bwc.wage_criterion,bwc.create_time
|
||||||
from bm_worker_contract bwc
|
from bm_worker_contract bwc
|
||||||
left join bm_worker_ein_pro_record bwepr on bwc.id = bwepr.worker_id
|
left join bm_worker_ein_msg bwepr on bwc.id = bwepr.worker_id and bwc.pro_id = bwepr.pro_id
|
||||||
where bwc.worker_id =#{id}
|
where bwc.worker_id =#{id}
|
||||||
<if test="proId != null">
|
<if test="proId != null">
|
||||||
AND bwepr.pro_id = #{proId}
|
AND bwepr.pro_id = #{proId}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue