Просмотр исходного кода

财务列表新增查看结项订单

anderx лет назад: 3
Родитель
Сommit
be42171f20
1 измененных файлов с 14 добавлено и 14 удалено
  1. 14 14
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

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

@@ -699,12 +699,12 @@
 	from t_order_new o left join department d on o.order_dep = d.id left join `user` u on o.buyer_id = u.id left join t_order_mid a on o.order_no=a.order_no
 	left join (select * from  t_order_outsource where type=0) too on o.order_no=too.order_no where delete_sign in(0,2) and approval in(0,1,2)
     and outsource=   #{o.outsource,jdbcType=INTEGER}
-  	 	<if test="o.processStatus == 3">
-	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
-	  	</if>
-	  	<if test="o.processStatus == 4">
-	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
-	  	</if>
+    <if test="o.processStatus == 3">
+      and o.process_status = #{o.processStatus,jdbcType=INTEGER}
+    </if>
+    <if test="o.processStatus == 4" >
+      and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
+    </if>
 	  	<if test="o.processStatus == 9">
 	  	and o.back_status = 3
 	  	</if>
@@ -715,7 +715,7 @@
      	</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)
+	  	and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)
 	  	</if>
   		<if test="o.departmentId != null and o.departmentId != &quot;&quot;">
 	  	and o.order_dep = #{o.departmentId,jdbcType=INTEGER}
@@ -767,12 +767,12 @@
  select count(*) from t_order_new o left join `user` u on o.buyer_id = u.id
 left join department d on o.order_dep = d.id   left join t_order_mid a on o.order_no=a.order_no
  where delete_sign in(0,2) and approval in(0,1,2) and outsource=  #{o.outsource,jdbcType=INTEGER}
-  	 	<if test="o.processStatus == 3">
-	  	and o.process_status = #{o.processStatus,jdbcType=INTEGER}
-	  	</if>
-	  	<if test="o.processStatus == 4">
-	  	and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
-	  	</if>
+    <if test="o.processStatus == 3">
+      and o.process_status = #{o.processStatus,jdbcType=INTEGER}
+    </if>
+    <if test="o.processStatus == 4" >
+      and o.process_status &gt;= #{o.processStatus,jdbcType=INTEGER}
+    </if>
 	  	<if test="o.processStatus == 9">
 	  	and o.back_status = 3
 	  	</if>
@@ -783,7 +783,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
      	</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)
+	  	and (o.order_status >=  #{o.orderStatus,jdbcType=INTEGER} or o.back_status=3)
 	  	</if>
   		<if test="o.departmentId != null and o.departmentId != &quot;&quot;">
 	  	and o.order_dep = #{o.departmentId,jdbcType=INTEGER}