|
|
@@ -736,7 +736,7 @@
|
|
|
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">
|
|
|
+ <if test="projectType !=null or businessCategory !=null">
|
|
|
left join business_project bp on e.commodity_id =bp.id
|
|
|
</if>
|
|
|
<if test="liabilitiesDepId !=null">
|
|
|
@@ -767,9 +767,6 @@
|
|
|
<if test="userName !=null">
|
|
|
and b.buyer_name like CONCAT('%',#{userName},'%')
|
|
|
</if>
|
|
|
- <if test="businessCategory !=null">
|
|
|
- and d2.id = #{businessCategory}
|
|
|
- </if>
|
|
|
<if test="projectName !=null">
|
|
|
and e.commodity_name like CONCAT('%',#{projectName},'%')
|
|
|
</if>
|
|
|
@@ -863,6 +860,9 @@
|
|
|
<if test="projectType ==1">
|
|
|
and bp.type in (7)
|
|
|
</if>
|
|
|
+ <if test="businessCategory !=null">
|
|
|
+ and bp.cid = #{businessCategory}
|
|
|
+ </if>
|
|
|
<if test="bigCustomer !=null">
|
|
|
and b2.big_customer = #{bigCustomer}
|
|
|
</if>
|
|
|
@@ -901,7 +901,7 @@
|
|
|
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">
|
|
|
+ <if test="projectType !=null or businessCategory !=null">
|
|
|
left join business_project bp on e.commodity_id =bp.id
|
|
|
</if>
|
|
|
<if test="liabilitiesDepId !=null">
|