|
|
@@ -1242,12 +1242,12 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectDunOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
|
|
|
- select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
|
|
|
+ select a.id,a.order_no as orderNo,date_format(b.sign_time,'%Y-%m-%d') as signDate,
|
|
|
c.nickname as userName,b.order_status as orderStatus,b.total_amount as totalAmount,
|
|
|
b.project_status as projectStatus,b.liquidation_status as liquidationStatus,
|
|
|
b.settlement_amount as settlementAmount,d.name as salesmanName,a.dun_subject as dunSubject,
|
|
|
date_format(a.start_time, '%Y-%m-%d') as startDate,dep.name as depName,
|
|
|
- a.money as accountsReceivable,(a.money-b.settlement_amount) as uncollectedAmount
|
|
|
+ a.money as accountsReceivable,if((a.money-b.settlement_amount) < 1,0,(a.money-b.settlement_amount)) as uncollectedAmount
|
|
|
from t_order_dun a 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
|