|
|
@@ -576,12 +576,15 @@ select
|
|
|
<if test="salesmanName !=null">
|
|
|
and d.name like concat('%',#{salesmanName},'%')
|
|
|
</if>
|
|
|
- <if test="complete ==0 and processState != 9">
|
|
|
+ <if test="complete ==0 and processState != 9 and processState != 5 and processState != 7">
|
|
|
and (a.process_state >= #{processState} or a.back_status >= #{processState})
|
|
|
</if>
|
|
|
- <if test="complete ==0 and processState == 9">
|
|
|
- and (a.process_state >= #{processState} and a.process_state < 10)or a.back_status >= #{processState}
|
|
|
- </if>
|
|
|
+ <if test="complete ==0 and processState == 9">
|
|
|
+ and (a.process_state >= #{processState} and a.process_state < 10)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}
|
|
|
+ </if>
|
|
|
<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
|
|
|
and a.process_state = #{processState} and a.status in (0,1,2,3)
|
|
|
</if>
|
|
|
@@ -704,12 +707,15 @@ select
|
|
|
<if test="salesmanName !=null">
|
|
|
and d.name like concat('%',#{salesmanName},'%')
|
|
|
</if>
|
|
|
- <if test="complete ==0 and processState != 9">
|
|
|
- and (a.process_state >= #{processState} or a.back_status >= #{processState})
|
|
|
- </if>
|
|
|
- <if test="complete ==0 and processState == 9">
|
|
|
- and (a.process_state >= #{processState} and a.process_state < 10)or a.back_status >= #{processState}
|
|
|
- </if>
|
|
|
+ <if test="complete ==0 and processState != 9 and processState != 5 and processState != 7">
|
|
|
+ and (a.process_state >= #{processState} or a.back_status >= #{processState})
|
|
|
+ </if>
|
|
|
+ <if test="complete ==0 and processState == 9">
|
|
|
+ and (a.process_state >= #{processState} and a.process_state < 10)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}
|
|
|
+ </if>
|
|
|
<if test="complete ==1 and processState != 6 and processState != 8 and processState != 9">
|
|
|
and a.process_state = #{processState} and a.status in (0,1,2,3)
|
|
|
</if>
|