|
@@ -544,7 +544,7 @@ where a.id= #{tid}
|
|
|
a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,a.company_name companyName,
|
|
a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,a.company_name companyName,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname, b.commodity_name pname,
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname, b.commodity_name pname,
|
|
|
b.project_status projectStatus,a.status,bp.`type` projectType,b.cost_reduction costReduction ,b.official_cost officialCost,c.total_amount totalAmount,
|
|
b.project_status projectStatus,a.status,bp.`type` projectType,b.cost_reduction costReduction ,b.official_cost officialCost,c.total_amount totalAmount,
|
|
|
- c.settlement_amount settlementAmount
|
|
|
|
|
|
|
+ c.settlement_amount settlementAmount,a.process_status processStatus
|
|
|
from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
|
|
from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
|
|
|
left join business_project bp on b.commodity_id=bp.id
|
|
left join business_project bp on b.commodity_id=bp.id
|
|
|
left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
|
|
left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
|
|
@@ -559,7 +559,7 @@ where a.id= #{tid}
|
|
|
and b.task_receiver= #{aid}
|
|
and b.task_receiver= #{aid}
|
|
|
</if>
|
|
</if>
|
|
|
<if test="lvl==4">
|
|
<if test="lvl==4">
|
|
|
- and choose_type =2
|
|
|
|
|
|
|
+ and a.choose_type =2
|
|
|
</if>
|
|
</if>
|
|
|
<if test="contractNo !=null">
|
|
<if test="contractNo !=null">
|
|
|
and c.contract_no like concat('%', #{contractNo},'%')
|
|
and c.contract_no like concat('%', #{contractNo},'%')
|
|
@@ -589,6 +589,9 @@ where a.id= #{tid}
|
|
|
and a.status= #{status}
|
|
and a.status= #{status}
|
|
|
</if>
|
|
</if>
|
|
|
order by a.status,a.create_time desc
|
|
order by a.status,a.create_time desc
|
|
|
|
|
+ <if test="lvl==4">
|
|
|
|
|
+ ,a.process_status
|
|
|
|
|
+ </if>
|
|
|
<if test="page_sql!=null">
|
|
<if test="page_sql!=null">
|
|
|
${page_sql}
|
|
${page_sql}
|
|
|
</if>
|
|
</if>
|