Browse Source

变更列表显示BUG修复

anderx 2 years ago
parent
commit
bba2aa86e3

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

@@ -576,24 +576,31 @@ select
 	<if test="salesmanName !=null">
 	and d.name like concat('%',#{salesmanName},'%')
 	</if>
-	<if test="complete ==0 and  processState != 5 and processState != 7">
-	 and ((a.process_state &gt;= #{processState} or a.back_status &gt;= #{processState}))
-	</if>
+    <if test="complete ==0 and  processState != 5  and processState &lt; 7">
+      and ((a.process_state &gt;= #{processState} 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})
     </if>
-	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
+    <if test="complete ==0 and processState == 8">
+      and ((a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}) and e.province !=11
+    </if>
+    <if test="complete ==0 and processState == 9">
+      and ((a.process_state = 9 )or a.back_status &gt;= #{processState})
+    </if>
+    <if test="complete ==0 and processState == 10">
+      and ((a.process_state =10 )or a.back_status &gt;= #{processState}) and e.province=11
+    </if>
+	<if test="complete ==1 and processState &lt; 6">
 	 and a.process_state = #{processState} and a.status in (0,1,2,3)
 	</if>
 	<if test="complete ==1 and processState == 6">
 	 and (a.process_state in(6)  and a.status in (0,1,2,3,5,6))
 	</if>
-	<if test="complete ==1 and processState == 8">
-	 and (a.process_state = 8  and  a.status =1)
-	</if>
-	<if test="complete ==1 and processState == 9">
-	 and (a.process_state = #{processState}  and a.status =1)
-	</if>
+	<if test="complete ==1 and processState > 7">
+      and (a.process_state = #{processState}  and a.status =1)
+    </if>
+
 	<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>
@@ -614,7 +621,7 @@ select
 	 and   a.status = 4
 	</if>
     <if test="complete ==5 and processState != 3 and processState != 4">
-	 and a.back_status &gt;= #{processState}
+	 and a.back_status = #{processState}
 	</if>
     <if test="complete ==6">
       and   a.status = 6
@@ -704,26 +711,29 @@ select
 	<if test="salesmanName !=null">
 	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})
-    </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})
+    <if test="complete ==0 and  processState != 5  and processState &lt; 7">
+      and ((a.process_state &gt;= #{processState} 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})
     </if>
-	<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
+    <if test="complete ==0 and processState == 8">
+      and ((a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}) and e.province !=11
+    </if>
+    <if test="complete ==0 and processState == 9">
+      and ((a.process_state = 9 )or a.back_status &gt;= #{processState})
+    </if>
+    <if test="complete ==0 and processState == 10">
+      and ((a.process_state =10 )or a.back_status &gt;= #{processState}) and e.province=11
+    </if>
+    <if test="complete ==1 and processState &lt; 6">
       and a.process_state = #{processState} and a.status in (0,1,2,3)
-	</if>
-	<if test="complete ==1 and processState == 6">
-	 and (a.process_state in(6)  and a.status in (0,1,2,3,5,6))
-	</if>
-    <if test="complete ==1 and processState == 8">
-      and (a.process_state = 8  and  a.status =1)
     </if>
-    <if test="complete ==1 and processState == 9">
-      and (a.process_state = #{processState} and   a.status =1)
+    <if test="complete ==1 and processState == 6">
+      and (a.process_state in(6)  and a.status in (0,1,2,3,5,6))
+    </if>
+    <if test="complete ==1 and processState > 7">
+      and (a.process_state = #{processState}  and a.status =1)
     </if>
     <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}
@@ -743,9 +753,9 @@ select
 	<if test="complete ==4">
 	 and   a.status = 4
 	</if>
-	<if test="complete ==5 and processState != 3 and processState != 4">
-	 and a.back_status &gt;= #{processState}
-	</if>
+    <if test="complete ==5 and processState != 3 and processState != 4">
+      and a.back_status = #{processState}
+    </if>
     <if test="complete ==6">
       and   a.status = 6
     </if>

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -52,7 +52,7 @@ yxjl_max=100
 amb.maxLvl=6
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.95
+static.host=//static.jishutao.com/1.2.96
 rd.static.host=//static.jishutao.com/RD/1.0.00
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.95
+static.host=//static.jishutao.com/1.2.96
 rd.static.host=//static.jishutao.com/RD/1.0.01
 avatar.upload.host=//static.jishutao.com/upload