|
|
@@ -686,13 +686,13 @@
|
|
|
</select>
|
|
|
|
|
|
<sql id="mainAllSql">
|
|
|
- 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,
|
|
|
+ select b.id,b.check_no,b.total_amount,b.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 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,
|
|
|
+ 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,
|
|
|
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
|
|
|
@@ -761,7 +761,7 @@
|
|
|
<id column="detId" jdbcType="INTEGER" property="id" />
|
|
|
<result column="detType" jdbcType="INTEGER" property="type" />
|
|
|
<result column="detTypeOther" jdbcType="INTEGER" property="typeOther" />
|
|
|
- <result column="amount" jdbcType="DECIMAL" property="amount" />
|
|
|
+ <result column="detAmount" 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" />
|