|
|
@@ -771,8 +771,8 @@
|
|
|
b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
|
|
|
c.id sonId,c.total_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,pro.contract_no sonContractNo,
|
|
|
- d.id detId,d.`type` detType,d.amount,d.real_amount realAmount ,d.start_district ,d.end_district,d.vehicle,d.vehicle_other,
|
|
|
+ c.duration,pr.plan,pro.contract_no sonContractNo,c.real_amount sonRealAmount,
|
|
|
+ d.id detId,d.`type` detType,d.amount,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,
|
|
|
date_format(d.start_time,'%Y-%m-%d %H:%i:%S')startTime,date_format(d.end_time,'%Y-%m-%d %H:%i:%S')endTime,
|
|
|
date_format(d.agree_time,'%Y-%m-%d')agreeTime
|
|
|
@@ -817,6 +817,7 @@
|
|
|
<resultMap id="SonExpenseAccountMap" type="com.goafanti.expenseAccount.bo.SonExpenseAccount">
|
|
|
<id column="sonId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="sonAmount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
+ <result column="sonRealAmount" jdbcType="DECIMAL" property="realAmount" />
|
|
|
<result column="sonType" jdbcType="INTEGER" property="type" />
|
|
|
<result column="sonTypeOther" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="secondary_type" jdbcType="INTEGER" property="secondaryType" />
|
|
|
@@ -837,6 +838,7 @@
|
|
|
<result column="detType" jdbcType="INTEGER" property="type" />
|
|
|
<result column="detTypeOther" jdbcType="INTEGER" property="typeOther" />
|
|
|
<result column="amount" jdbcType="DECIMAL" property="amount" />
|
|
|
+ <result column="detRealAmount" jdbcType="DECIMAL" property="realAmount" />
|
|
|
<result column="start_district" jdbcType="VARCHAR" property="startDistrict" />
|
|
|
<result column="end_district" jdbcType="VARCHAR" property="endDistrict" />
|
|
|
<result column="vehicle" jdbcType="INTEGER" property="vehicle" />
|