|
|
@@ -1038,7 +1038,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- and a.process_status in (5,6,7,99)
|
|
|
+ and a.process_status in (3,5,6,7,99)
|
|
|
and a.order_status in(1,2,3,4,6)
|
|
|
</if>
|
|
|
<if test="deps!=null">
|
|
|
@@ -1047,16 +1047,16 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
#{dep}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="distribution == 4">
|
|
|
+ <if test="distribution == 0">
|
|
|
and a.process_status = 3
|
|
|
</if>
|
|
|
- <if test="distribution == 0">
|
|
|
- and a.process_status < 6
|
|
|
- </if>
|
|
|
<if test="distribution == 1">
|
|
|
- and a.process_status = 6
|
|
|
+ and a.process_status = 5
|
|
|
</if>
|
|
|
<if test="distribution == 2">
|
|
|
+ and a.process_status = 6
|
|
|
+ </if>
|
|
|
+ <if test="distribution == 3">
|
|
|
and a.process_status = 7
|
|
|
</if>
|
|
|
<if test="name != null">
|
|
|
@@ -1207,7 +1207,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</if>
|
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
|
- and a.process_status in (5,6,7,99)
|
|
|
+ and a.process_status in (3,5,6,7,99)
|
|
|
and a.order_status in(1,2,3,4,6)
|
|
|
</if>
|
|
|
<if test="deps!=null">
|
|
|
@@ -1216,15 +1216,18 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
#{dep}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- <if test="distribution == 0">
|
|
|
- and a.process_status < 6
|
|
|
- </if>
|
|
|
- <if test="distribution == 1">
|
|
|
- and a.process_status = 6
|
|
|
- </if>
|
|
|
- <if test="distribution == 2">
|
|
|
- and a.process_status = 7
|
|
|
- </if>
|
|
|
+ <if test="distribution == 0">
|
|
|
+ and a.process_status = 3
|
|
|
+ </if>
|
|
|
+ <if test="distribution == 1">
|
|
|
+ and a.process_status = 5
|
|
|
+ </if>
|
|
|
+ <if test="distribution == 2">
|
|
|
+ and a.process_status = 6
|
|
|
+ </if>
|
|
|
+ <if test="distribution == 3">
|
|
|
+ and a.process_status = 7
|
|
|
+ </if>
|
|
|
<if test="name != null">
|
|
|
and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|