|
|
@@ -736,6 +736,9 @@
|
|
|
left join t_order_task c on a.order_no =c.order_no and c.main =1
|
|
|
left join user_mid b2 on a.buyer_id=b2.uid
|
|
|
left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
|
|
|
+ <if test="projectType !=null">
|
|
|
+ left join business_project bp on e.commodity_id =bp.id
|
|
|
+ </if>
|
|
|
<if test="liabilitiesDepId !=null">
|
|
|
left join admin e2 on e.task_receiver=e2.id
|
|
|
</if>
|
|
|
@@ -854,8 +857,11 @@
|
|
|
<if test="approval ==1">
|
|
|
and a.approval > 0
|
|
|
</if>
|
|
|
- <if test="projectType !=null">
|
|
|
- and b.project_type = #{projectType}
|
|
|
+ <if test="projectType ==0">
|
|
|
+ and bp.type in (0,1,2,3,4,5,6,8)
|
|
|
+ </if>
|
|
|
+ <if test="projectType ==1">
|
|
|
+ and bp.type in (7)
|
|
|
</if>
|
|
|
<if test="bigCustomer !=null">
|
|
|
and b2.big_customer = #{bigCustomer}
|
|
|
@@ -895,6 +901,12 @@
|
|
|
left join t_order_task c on a.order_no =c.order_no and c.main =1
|
|
|
left join user_mid b2 on a.buyer_id=b2.uid
|
|
|
left join t_order_task e on a.order_no =e.order_no and e.split_status in (0,2)
|
|
|
+ <if test="projectType !=null">
|
|
|
+ left join business_project bp on e.commodity_id =bp.id
|
|
|
+ </if>
|
|
|
+ <if test="liabilitiesDepId !=null">
|
|
|
+ left join admin e2 on e.task_receiver=e2.id
|
|
|
+ </if>
|
|
|
left join t_task_mid e3 on e.id=e3.tid
|
|
|
left join t_task_member ttm on e.id =ttm.tid
|
|
|
<if test="dunType !=null">
|