|
|
@@ -1094,7 +1094,7 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
|
|
|
left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
|
|
|
left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress
|
|
|
group by task_id) i on a.id=i.task_id left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
|
|
|
- on a.id=l.tid where e.delete_sign in (0,1,2) and e.order_status in (2,4)
|
|
|
+ on a.id=l.tid where e.delete_sign in (0,2,3) and e.order_status in (2,4)
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
<if test="role == 0 ">
|
|
|
and a.task_receiver= #{aid,jdbcType=VARCHAR}
|
|
|
@@ -1158,7 +1158,7 @@ ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.s
|
|
|
|
|
|
<select id="selectOrderTaskListCount" resultType="java.lang.Integer">
|
|
|
select count(*) from t_order_task a left join t_order_new e on a.order_no=e.order_no
|
|
|
- left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign in (0,1,2) and e.order_status in (2,4)
|
|
|
+ left join admin g on e.salesman_id=g.id left join department h on g.department_id=h.id where e.delete_sign in (0,2,3) and e.order_status in (2,4)
|
|
|
and a.outsource= #{outsource,jdbcType=INTEGER}
|
|
|
<if test="role == 0 ">
|
|
|
and a.task_receiver= #{aid,jdbcType=VARCHAR}
|