|
@@ -436,10 +436,10 @@
|
|
and bus.order_id like concat ('%',#{declare.orderId},'%')
|
|
and bus.order_id like concat ('%',#{declare.orderId},'%')
|
|
</if>
|
|
</if>
|
|
<if test="declare!=null and declare.name!=null and declare.name!=''">
|
|
<if test="declare!=null and declare.name!=null and declare.name!=''">
|
|
- and (bus.orderName like concat ('%',#{declare.name},'%')
|
|
|
|
|
|
+ and bus.orderName like concat ('%',#{declare.name},'%')
|
|
</if>
|
|
</if>
|
|
<if test="declare!=null and declare.reportNo!=null and declare.reportNo!=''">
|
|
<if test="declare!=null and declare.reportNo!=null and declare.reportNo!=''">
|
|
- and bus.report_no like concat ('%',#{declare.reportNo},'%')
|
|
|
|
|
|
+ and bus.reportNo like concat ('%',#{declare.reportNo},'%')
|
|
</if>
|
|
</if>
|
|
<if test="declare!=null and declare.commissionRateId!=null ">
|
|
<if test="declare!=null and declare.commissionRateId!=null ">
|
|
and bus.commission_rate_id = #{declare.commissionRateId}
|
|
and bus.commission_rate_id = #{declare.commissionRateId}
|
|
@@ -535,7 +535,7 @@
|
|
and bus.orderName like concat ('%',#{declare.name},'%')
|
|
and bus.orderName like concat ('%',#{declare.name},'%')
|
|
</if>
|
|
</if>
|
|
<if test="declare!=null and declare.reportNo!=null and declare.reportNo!=''">
|
|
<if test="declare!=null and declare.reportNo!=null and declare.reportNo!=''">
|
|
- and bus.report_no like concat ('%',#{declare.reportNo},'%')
|
|
|
|
|
|
+ and bus.reportNo like concat ('%',#{declare.reportNo},'%')
|
|
</if>
|
|
</if>
|
|
<if test="declare!=null and declare.commissionRateId!=null ">
|
|
<if test="declare!=null and declare.commissionRateId!=null ">
|
|
and bus.commission_rate_id = #{declare.commissionRateId}
|
|
and bus.commission_rate_id = #{declare.commissionRateId}
|