Przeglądaj źródła

特批审核列表修改

anderx 2 lat temu
rodzic
commit
0db38779f3

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

@@ -549,6 +549,9 @@ select
 		#{id}
 		</foreach>
 	</if>
+    <if test="processState==8 and aid !=null">
+      and e.approval_aid =#{aid}
+    </if>
 	<if test="userName !=null">
 	and c.nickname like concat('%',#{userName},'%')
 	</if>
@@ -583,15 +586,12 @@ select
       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 == 8">
-      and ((a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}) and e.province !=11
+      and (a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
     </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">
+    <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">
@@ -684,6 +684,9 @@ select
         #{id}
       </foreach>
     </if>
+    <if test="processState==8 and aid !=null">
+      and e.approval_aid =#{aid}
+    </if>
     <if test="userName !=null">
       and c.nickname like concat('%',#{userName},'%')
     </if>
@@ -718,14 +721,11 @@ select
       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 == 8">
-      and ((a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}) and e.province !=11
+      and (a.process_state &gt;= 8 and  a.process_state &lt; 10)or a.back_status &gt;= #{processState}
     </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>