Browse Source

财务审核修改

anderx 2 years ago
parent
commit
b86d04cbd4
1 changed files with 23 additions and 11 deletions
  1. 23 11
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

+ 23 - 11
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -784,10 +784,14 @@
 	  	and o.back_status = 3
 	  	</if>
 	  	<if test="fids != null and fids.size() &gt; 0">
-	  	and d.finance_id in
-	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
-       		#{item}
-     	</foreach>
+	  	and (d.finance_id in
+          <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+            #{item}
+          </foreach>
+	  	    or d.retrial_finance_id in
+          <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+            #{item}
+          </foreach>)
 		</if>
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)
@@ -866,12 +870,16 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
 	  	<if test="o.processStatus == 9">
 	  	and o.back_status = 3
 	  	</if>
-	  	<if test="fids != null and fids.size() &gt; 0">
-	  	and d.finance_id in
-	   <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
-       		#{item}
-     	</foreach>
-		</if>
+    <if test="fids != null and fids.size() &gt; 0">
+      and (d.finance_id in
+      <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+        #{item}
+      </foreach>
+      or d.retrial_finance_id in
+      <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+        #{item}
+      </foreach>)
+    </if>
   		<if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
 	  	and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)
 	  	</if>
@@ -1558,10 +1566,14 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
       and o.back_status = 3
     </if>
     <if test="fids != null and fids.size() &gt; 0">
-      and d.finance_id in
+      and (d.finance_id in
       <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
         #{item}
       </foreach>
+      or d.retrial_finance_id in
+      <foreach close=")" collection="fids" index="" item="item" open="(" separator=",">
+        #{item}
+      </foreach>)
     </if>
     <if test="o.orderStatus != null and o.orderStatus != &quot;&quot;">
       and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)