|
@@ -503,9 +503,10 @@
|
503
|
left join prj_Member m on m.XM = p.ID and m.XMJS = 1
|
503
|
left join prj_Member m on m.XM = p.ID and m.XMJS = 1
|
504
|
left join prj_Budget b on b.XM = p.ID and b.FJ = ''
|
504
|
left join prj_Budget b on b.XM = p.ID and b.FJ = ''
|
505
|
left join prj_FeeScheme f on f.ZB = p.ID
|
505
|
left join prj_FeeScheme f on f.ZB = p.ID
|
|
|
506
|
+ left join prj_AnnualBudget pa on pa.rws = f.zb and pa.nf = f.nf
|
506
|
where p.XMMB != 1
|
507
|
where p.XMMB != 1
|
507
|
and p.SPZT = '审批结束'
|
508
|
and p.SPZT = '审批结束'
|
508
|
- and CONCAT(p.ID, f.NF) not in (select CONCAT(RWS, NF) from prj_AnnualBudget where XMLX !='s8')
|
|
|
|
|
509
|
+ and (p.xmlx = 's8' or ( pa.nf is null ))
|
509
|
<if test="zwmc != null and zwmc != ''">
|
510
|
<if test="zwmc != null and zwmc != ''">
|
510
|
and p.ZWMC like '%'+#{zwmc}+'%'
|
511
|
and p.ZWMC like '%'+#{zwmc}+'%'
|
511
|
</if>
|
512
|
</if>
|