|
|
@@ -748,7 +748,7 @@
|
|
|
b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
|
|
|
c.id sonId,c.total_amount sonTotalAmount,c.settlement_amount sonSettlementAmount,c.amount sonAmount, c.`type` sonType,c.type_other sonTypeOther,
|
|
|
c.user_names ,c.release_start ,c.release_end , c.district_name districtName,c.user_names userNames,c.secondary_type ,c.secondary_type_other,c.attachment_url,
|
|
|
- c.duration,pr.plan,c.real_amount sonRealAmount,o.order_no,o.contract_no,pr.type publicReleaseType,
|
|
|
+ c.duration,pr.plan,c.real_amount sonRealAmount,o.order_no,o.contract_no,pr.type publicReleaseType,bp.`type` projectType,
|
|
|
c.debit_id debitId, debit.real_amount DebitRealAmount ,debit.settlement_amount DebitSettlementAmount,debit.liquidation_status DebitliquidationStatus,
|
|
|
d.id detId,d.`type` detType,d.amount detAmount,d.real_amount detRealAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
|
|
|
d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,d.type_other detTypeOther,
|
|
|
@@ -758,7 +758,8 @@
|
|
|
from expense_relationship a left join expense_account b on a.id =b.id left join expense_account c on a.ea_id =c.id
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
left join expense_account_private eap on b.eaaid =eap.id left join expense_account_details d on c.id =d.eaid
|
|
|
- left join t_order_new o on c.order_no =o.order_no left join t_order_mid tm on c.order_no=tm.order_no
|
|
|
+ left join t_order_new o on c.order_no =o.order_no left join t_order_task tot on o.order_no =tot.order_no
|
|
|
+ left join business_project bp on tot.commodity_id =bp.id and bp.`type` =8 left join t_order_mid tm on c.order_no=tm.order_no
|
|
|
left join public_release pr on c.prid=pr.id left join t_order_new pro on pr.order_no=pro.order_no
|
|
|
left join expense_account debit on c.debit_id=debit.id
|
|
|
where a.id= #{id}
|
|
|
@@ -822,6 +823,7 @@
|
|
|
<result column="debitLiquidationStatus" jdbcType="INTEGER" property="debitLiquidationStatus" />
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
<result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
|
|
|
+ <result column="projectType" jdbcType="VARCHAR" property="projectType" />
|
|
|
<result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
|
|
|
<result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
|
|
|
<result column="publicReleaseType" jdbcType="INTEGER" property="publicReleaseType" />
|