|
|
@@ -580,7 +580,7 @@ select
|
|
|
and ((a.process_state >= #{processState} or a.back_status >= #{processState}))
|
|
|
</if>
|
|
|
<if test="complete ==0 and (processState == 5 or processState == 7)">
|
|
|
- and ((a.process_state >= 1 and a.process_state < 10)or a.back_status >= #{processState})
|
|
|
+ and ((a.process_state >= #{processState} and a.process_state < 10)or a.back_status >= #{processState})
|
|
|
</if>
|
|
|
<if test="complete ==0 and processState == 8">
|
|
|
and ((a.process_state >= 8 and a.process_state < 10)or a.back_status >= #{processState}) and e.province !=11
|
|
|
@@ -597,7 +597,7 @@ select
|
|
|
<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">
|
|
|
+ <if test="complete ==1 and processState > 6">
|
|
|
and (a.process_state = #{processState} and a.status =1)
|
|
|
</if>
|
|
|
|
|
|
@@ -715,7 +715,7 @@ select
|
|
|
and ((a.process_state >= #{processState} or a.back_status >= #{processState}))
|
|
|
</if>
|
|
|
<if test="complete ==0 and (processState == 5 or processState == 7)">
|
|
|
- and ((a.process_state >= 1 and a.process_state < 10)or a.back_status >= #{processState})
|
|
|
+ and ((a.process_state >= #{processState} and a.process_state < 10)or a.back_status >= #{processState})
|
|
|
</if>
|
|
|
<if test="complete ==0 and processState == 8">
|
|
|
and ((a.process_state >= 8 and a.process_state < 10)or a.back_status >= #{processState}) and e.province !=11
|
|
|
@@ -732,7 +732,7 @@ select
|
|
|
<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">
|
|
|
+ <if test="complete ==1 and processState > 6">
|
|
|
and (a.process_state = #{processState} and a.status =1)
|
|
|
</if>
|
|
|
|