|
|
@@ -895,12 +895,11 @@
|
|
|
and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
and process_status >= 2
|
|
|
<if test="o.processStatus == 2">
|
|
|
- and o.finance_id is not null
|
|
|
+ and o.finance_id is null
|
|
|
</if>
|
|
|
<if test="o.processStatus == 3">
|
|
|
and o.finance_id is not null
|
|
|
</if>
|
|
|
-
|
|
|
<if test="o.orderNo != null and o.orderNo != """>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
@@ -924,14 +923,12 @@
|
|
|
<select id="getAllUnassignedCountOrder" parameterType="Map" resultType="java.lang.Integer">
|
|
|
select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
|
|
|
where delete_sign = 0 and order_status = 2 and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
|
|
|
+ and process_status >= 2
|
|
|
<if test="o.processStatus == 2">
|
|
|
- and process_status = #{o.processStatus,jdbcType=INTEGER}
|
|
|
+ and o.finance_id is null
|
|
|
</if>
|
|
|
<if test="o.processStatus == 3">
|
|
|
- and process_status >= #{o.processStatus,jdbcType=INTEGER}
|
|
|
- </if>
|
|
|
- <if test="o.processStatus == null or o.processStatus ==''">
|
|
|
- and process_status >= 2
|
|
|
+ and o.finance_id is not null
|
|
|
</if>
|
|
|
<if test="o.orderNo != null and o.orderNo != """>
|
|
|
and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
|