|
|
@@ -905,7 +905,8 @@
|
|
|
|
|
|
|
|
|
<select id="ExpenseDetailsList" resultMap="MainMap">
|
|
|
- select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,
|
|
|
+ select c.id detId,c.`type` sonType,ead.`type` detType,ead.amount ,ead.real_amount ,
|
|
|
+ b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,
|
|
|
dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid ,
|
|
|
c.id sonId,c.total_amount sonAmount,c.`type` ,c.type_other ,c.user_names ,c.release_start ,c.release_end
|
|
|
@@ -914,7 +915,7 @@
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
left join t_order_new o on b.order_no =o.order_no
|
|
|
left join expense_account c on a.ea_id =c.id
|
|
|
-
|
|
|
+ left join expense_account_details ead on c.id=ead.eaid
|
|
|
left join admin ad on b.aid=ad.id
|
|
|
left join department adDep on ad .department_id=adDep.id
|
|
|
where 1=1 and b.expense_main =1
|