Browse Source

派单列表BUG修复

anderx 6 years ago
parent
commit
7baa5e2d07
1 changed files with 4 additions and 7 deletions
  1. 4 7
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 4 - 7
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -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 != &quot;&quot;">
   	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 &gt;= 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 &gt;= #{o.processStatus,jdbcType=INTEGER}
-  	</if>
-  	<if test="o.processStatus == null or o.processStatus ==''">
-  	and process_status &gt;= 2
+  	and o.finance_id is not null
   	</if>
   	<if test="o.orderNo != null and o.orderNo != &quot;&quot;">
   	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}