Browse Source

版本切换

anderx 2 years ago
parent
commit
afce1a71f5
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

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

@@ -598,7 +598,7 @@ select
 	 and a.process_state > #{processState}
 	</if>
 	<if test="complete ==2 and processState == 6">
-	 and a.process_state &gt; 6 and a.process_state &lt; 10
+	 and(a.process_state &gt; 6 and a.process_state &lt; 10) or (a.process_state =6 and a.status=4)
 	</if>
 	<if test="complete ==2 and processState == 8">
 	 and ((a.process_state = 8  and  (a.status = 4 or a.status = 2))or a.process_state &gt; 8)
@@ -724,9 +724,9 @@ select
     <if test="complete ==2 and processState != 6 and processState != 8 and processState != 9 and processState !=3 and processState !=4">
       and a.process_state &gt; #{processState}
     </if>
-	<if test="complete ==2 and processState == 6">
-	 and a.process_state &gt; 6 and a.process_state &lt; 10
-	</if>
+    <if test="complete ==2 and processState == 6">
+      and(a.process_state &gt; 6 and a.process_state &lt; 10) or (a.process_state =6 and a.status=4)
+    </if>
 	<if test="complete ==2 and processState == 8">
 	 and ((a.process_state = 8  and  (a.status = 4 or a.status = 2))or a.process_state &gt; 8)
 	</if>