Merge branch 'master' of http://192.168.30.2:3000/bonus/Bonus-Cloud-Material
This commit is contained in:
commit
d898abed05
|
|
@ -211,7 +211,7 @@
|
||||||
FROM
|
FROM
|
||||||
direct_apply_info dai
|
direct_apply_info dai
|
||||||
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
|
LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id
|
||||||
LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id and sai.status =1
|
LEFT JOIN slt_agreement_info sai ON dai.back_agreement_id = sai.agreement_id and sai.status =0
|
||||||
AND sai.type_id = dad.type_id and IFNULL(dad.ma_id,0)=IFNULL(sai.ma_id,0)
|
AND sai.type_id = dad.type_id and IFNULL(dad.ma_id,0)=IFNULL(sai.ma_id,0)
|
||||||
LEFT JOIN lease_apply_info lai on lai.id=sai.lease_id
|
LEFT JOIN lease_apply_info lai on lai.id=sai.lease_id
|
||||||
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
|
LEFT JOIN ma_type mt ON mt.type_id = dad.type_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue