Explorar o código

Merge remote-tracking branch 'origin/test' into dev

anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
f6f8f71ac9

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

@@ -1308,17 +1308,18 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
   	<if test="specially == 3">
-  	 and  a.order_status=2 and a.process_status != 99
-  	</if>
-  	 <if test="approval ==0">
-  	and a.approval = 0
+  	 and  a.order_status=2 and a.process_status != 99 
+  	<if test="approval ==0">
+  	and a.approval &gt; 0
   	</if>
   	<if test="approval ==1">
+  	and a.process_status = 7
   	and a.approval = 1
   	</if>
   	<if test="approval ==2">
   	and a.approval &gt; 1
-  	</if> 
+  	</if>
+  	</if>
   	<if test="specially == 4">
   	and e.main=1
   	and a.process_status in (4,5,6,99)
@@ -1433,6 +1434,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	and a.approval &gt; 0
   	</if>
   	<if test="approval ==1">
+  	and a.process_status = 7
   	and a.approval = 1
   	</if>
   	<if test="approval ==2">