|
|
@@ -1368,17 +1368,17 @@ where super_id is null ) e on e.order_no=a.order_no
|
|
|
if((a.money-b.settlement_amount) < 1,0,(a.money-b.settlement_amount)) as uncollectedAmount,b.order_status as orderStatus,b.project_status as projectStatus,
|
|
|
date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,date_format(b.sign_time,'%Y-%m-%d') as signDate,
|
|
|
<if test="newStatus == 0 ">
|
|
|
- a.dun_subject as dunSubject
|
|
|
+ a.dun_subject as dunSubject,a.dun_status dunStatus
|
|
|
from t_order_dun a
|
|
|
</if>
|
|
|
<if test="newStatus == 1 ">
|
|
|
- a.project_type projectType,
|
|
|
+ a.project_type projectType,a.status dunStatus,
|
|
|
a.dun_type dunType
|
|
|
from new_order_dun a
|
|
|
</if>
|
|
|
left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
|
|
|
left join admin d on b.salesman_id=d.id left join department dep on d.department_id=dep.id
|
|
|
- where a.start_time is not null and b.delete_sign != 1
|
|
|
+ where b.delete_sign != 1
|
|
|
<if test="name != null">
|
|
|
and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
|
|
|
</if>
|