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

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

@@ -577,13 +577,13 @@ select
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
 	<if test="complete ==0 and processState != 9 and  processState != 5 and processState != 7">
-	 and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
+	 and ((a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState}))
 	</if>
     <if test="complete ==0 and processState == 9">
-      and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+      and ((a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState})
     </if>
     <if test="complete ==0 and (processState == 5 or processState == 7)">
-      and (a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+      and ((a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState})
     </if>
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
 	 and a.process_state = #{processState} and a.status in (0,1,2,3)
@@ -601,7 +601,7 @@ select
 	 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) or (a.process_state =6 and a.status=4)
+	 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)
@@ -711,10 +711,10 @@ select
       and (a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState})
     </if>
     <if test="complete ==0 and processState == 9">
-      and (a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+      and ((a.process_state &gt;= #{processState} and  a.process_state &lt; 10)or a.back_status &gt;= #{processState})
     </if>
     <if test="complete ==0 and (processState == 5 or processState == 7)">
-      and (a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
+      and ((a.process_state &gt;= 1 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState})
     </if>
 	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
       and a.process_state = #{processState} and a.status in (0,1,2,3)
@@ -732,7 +732,7 @@ select
       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) or (a.process_state =6 and a.status=4)
+      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)