|
|
@@ -689,7 +689,7 @@
|
|
|
select b.id,b.check_no,b.total_amount,b.order_no,o.contract_no,b.aname,b.apply_dep,b.pay_dep,b.real_amount,b.type_other ,b.aid,
|
|
|
date_format(b.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.examine_name, dep.name applyDepName,dep2.name payDepName,
|
|
|
b.remarks,b.eaaid ,eap.name ,eap.bank ,eap.accounts ,b.status,b.process_status,
|
|
|
- c.id sonId,c.total_amount sonAmount,c.settlement_amount sonSettlementAmount,c.`type` sonType,c.type_other sonTypeOther,c.user_names ,c.release_start ,c.release_end ,
|
|
|
+ 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,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,
|
|
|
@@ -716,6 +716,7 @@
|
|
|
<result column="type_other" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
<result column="real_amount" jdbcType="DECIMAL" property="realAmount" />
|
|
|
+ <result column="amount" jdbcType="DECIMAL" property="amount" />
|
|
|
<result column="order_no" jdbcType="VARCHAR" property="orderNo" />
|
|
|
<result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
|
|
|
<result column="aname" jdbcType="VARCHAR" property="aname" />
|
|
|
@@ -737,9 +738,10 @@
|
|
|
|
|
|
<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="sonTotalAmount" jdbcType="DECIMAL" property="totalAmount" />
|
|
|
<result column="sonSettlementAmount" jdbcType="DECIMAL" property="settlementAmount" />
|
|
|
<result column="sonRealAmount" jdbcType="DECIMAL" property="realAmount" />
|
|
|
+ <result column="sonAmount" jdbcType="DECIMAL" property="amount" />
|
|
|
<result column="sonType" jdbcType="INTEGER" property="type" />
|
|
|
<result column="sonTypeOther" jdbcType="VARCHAR" property="typeOther" />
|
|
|
<result column="secondary_type" jdbcType="INTEGER" property="secondaryType" />
|
|
|
@@ -812,10 +814,10 @@
|
|
|
|
|
|
|
|
|
<select id="ExpenseMainList" 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 b.id,b.check_no,b.total_amount,b.order_no,o.contract_no ,b.aname,b.apply_dep,b.pay_dep,b.amount,
|
|
|
date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,b.status,b.process_status,b.examine_name,
|
|
|
dep.name applyDepName,dep2.name payDepName, b.remarks,b.eaaid ,
|
|
|
- c.id sonId,c.total_amount sonAmount,c.settlement_amount sonSettlementAmount,c.`type` sonType,c.type_other sonTypeOTher,
|
|
|
+ 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.attachment_url attachmentUrl,c.secondary_type,c.secondary_type_other
|
|
|
from expense_relationship a
|
|
|
left join expense_account b on a.id =b.id
|