|
|
@@ -598,7 +598,7 @@ select
|
|
|
and a.process_state > #{processState}
|
|
|
</if>
|
|
|
<if test="complete ==2 and processState == 6">
|
|
|
- and a.process_state > 6 and a.process_state < 10
|
|
|
+ and(a.process_state > 6 and a.process_state < 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 > 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 > #{processState}
|
|
|
</if>
|
|
|
- <if test="complete ==2 and processState == 6">
|
|
|
- and a.process_state > 6 and a.process_state < 10
|
|
|
- </if>
|
|
|
+ <if test="complete ==2 and processState == 6">
|
|
|
+ and(a.process_state > 6 and a.process_state < 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 > 8)
|
|
|
</if>
|