|
@@ -1018,17 +1018,17 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
<sql id="selectOrderNewSql">
|
|
<sql id="selectOrderNewSql">
|
|
|
|
|
|
|
|
<if test="specially ==7">
|
|
<if test="specially ==7">
|
|
|
- and a.process_status > 5
|
|
|
|
|
|
|
+ and a.process_status > 6
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially ==8">
|
|
<if test="specially ==8">
|
|
|
- and a.process_status > 5
|
|
|
|
|
|
|
+ and a.process_status > 6
|
|
|
<if test="uid !=null">
|
|
<if test="uid !=null">
|
|
|
and a.buyer_id = #{uid}
|
|
and a.buyer_id = #{uid}
|
|
|
</if>
|
|
</if>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially ==9">
|
|
<if test="specially ==9">
|
|
|
- and a.process_status > 5 and bp.type=5
|
|
|
|
|
|
|
+ and a.process_status > 6 and bp.type=5
|
|
|
<if test="aid !=null">
|
|
<if test="aid !=null">
|
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
and a.salesman_id = #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
@@ -1060,11 +1060,11 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and dep.approval_aid= #{aid,jdbcType=VARCHAR}
|
|
and dep.approval_aid= #{aid,jdbcType=VARCHAR}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="approval ==0">
|
|
<if test="approval ==0">
|
|
|
- and a.process_status in(4)
|
|
|
|
|
|
|
+ and a.process_status =5
|
|
|
and a.approval = 0
|
|
and a.approval = 0
|
|
|
</if>
|
|
</if>
|
|
|
<if test="approval ==1">
|
|
<if test="approval ==1">
|
|
|
- and a.process_status in(4)
|
|
|
|
|
|
|
+ and a.process_status =5
|
|
|
and a.approval in
|
|
and a.approval in
|
|
|
<if test="manageType ==0">
|
|
<if test="manageType ==0">
|
|
|
(1)
|
|
(1)
|
|
@@ -1099,7 +1099,7 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
</if>
|
|
</if>
|
|
|
</if>
|
|
</if>
|
|
|
<if test="specially == 4">
|
|
<if test="specially == 4">
|
|
|
- and a.process_status in (3,5,6,7,99)
|
|
|
|
|
|
|
+ and a.process_status in (3,6,7,8,99)
|
|
|
and a.order_status in(1,2,3,4,6)
|
|
and a.order_status in(1,2,3,4,6)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="deps!=null">
|
|
<if test="deps!=null">
|
|
@@ -1112,13 +1112,13 @@ left join department d on o.order_dep = d.id left join t_order_mid a on o.orde
|
|
|
and a.process_status = 3
|
|
and a.process_status = 3
|
|
|
</if>
|
|
</if>
|
|
|
<if test="distribution == 1">
|
|
<if test="distribution == 1">
|
|
|
- and a.process_status = 5
|
|
|
|
|
|
|
+ and a.process_status = 6
|
|
|
</if>
|
|
</if>
|
|
|
<if test="distribution == 2">
|
|
<if test="distribution == 2">
|
|
|
- and a.process_status = 6
|
|
|
|
|
|
|
+ and a.process_status = 7
|
|
|
</if>
|
|
</if>
|
|
|
<if test="distribution == 3">
|
|
<if test="distribution == 3">
|
|
|
- and a.process_status = 7
|
|
|
|
|
|
|
+ and a.process_status = 8
|
|
|
</if>
|
|
</if>
|
|
|
<if test="name != null">
|
|
<if test="name != null">
|
|
|
and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
and b.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|