|
|
@@ -537,10 +537,10 @@ select
|
|
|
and (a.process_state in(5,9) and a.status !=4)
|
|
|
</if>
|
|
|
<if test="complete ==1 and processState == 7">
|
|
|
- and (a.process_state = 7 and a.status != 4 and a.status !=2)
|
|
|
+ and (a.process_state = 7 and a.status =1)
|
|
|
</if>
|
|
|
<if test="complete ==1 and processState == 8">
|
|
|
- and a.process_state = #{processState} and a.status != 4 and a.status !=2
|
|
|
+ and (a.process_state = #{processState} a.status =1)
|
|
|
</if>
|
|
|
<if test="complete ==2 and processState != 5 and processState != 7 and processState != 8">
|
|
|
and a.process_state > #{processState}
|
|
|
@@ -649,12 +649,12 @@ select
|
|
|
<if test="complete ==1 and processState == 5">
|
|
|
and (a.process_state in(5,9) and a.status !=4)
|
|
|
</if>
|
|
|
- <if test="complete ==1 and processState == 7">
|
|
|
- and (a.process_state = 7 and a.status != 4 and a.status !=2)
|
|
|
- </if>
|
|
|
- <if test="complete ==1 and processState == 8">
|
|
|
- and a.process_state = #{processState} and a.status != 4 and a.status !=2
|
|
|
- </if>
|
|
|
+ <if test="complete ==1 and processState == 7">
|
|
|
+ and (a.process_state = 7 and a.status =1)
|
|
|
+ </if>
|
|
|
+ <if test="complete ==1 and processState == 8">
|
|
|
+ and (a.process_state = #{processState} a.status =1)
|
|
|
+ </if>
|
|
|
<if test="complete ==2 and processState != 5 and processState != 7 and processState != 8">
|
|
|
and a.process_state > #{processState}
|
|
|
</if>
|