|
|
@@ -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,tm.bid_type bidType,
|
|
|
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,
|
|
|
@@ -826,6 +826,7 @@
|
|
|
<result column="buyer_name" jdbcType="VARCHAR" property="buyerName" />
|
|
|
<result column="buyer_id" jdbcType="VARCHAR" property="buyerId" />
|
|
|
<result column="publicReleaseType" jdbcType="INTEGER" property="publicReleaseType" />
|
|
|
+ <result column="bidType" jdbcType="INTEGER" property="bidType" />
|
|
|
<association property="detList" resultMap="ExpenseAccountDetailsMap"/>
|
|
|
</resultMap>
|
|
|
|