|
|
@@ -765,7 +765,9 @@
|
|
|
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,
|
|
|
- d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address
|
|
|
+ d.pay_type ,d.invoice_type ,d.invoice_no,d.payer_name ,d.open_bank ,d.bank_accounts ,d.open_bank_address,
|
|
|
+ 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
|
|
|
from expense_relationship a left join expense_account b on a.id =b.id
|
|
|
left join department dep on b.apply_dep =dep.id left join department dep2 on b.pay_dep =dep2.id
|
|
|
left join t_order_new o on b.order_no =o.order_no left join expense_account_private eap on b.eaaid =eap.id
|
|
|
@@ -836,7 +838,9 @@
|
|
|
<result column="open_bank" jdbcType="VARCHAR" property="openBank" />
|
|
|
<result column="bank_accounts" jdbcType="VARCHAR" property="bankAccounts" />
|
|
|
<result column="open_bank_address" jdbcType="VARCHAR" property="openBankAddress" />
|
|
|
-
|
|
|
+ <result column="startTime" jdbcType="VARCHAR" property="startTime" />
|
|
|
+ <result column="endTime" jdbcType="VARCHAR" property="endTime" />
|
|
|
+ <result column="agreeTime" jdbcType="VARCHAR" property="agreeTime" />
|
|
|
</resultMap>
|
|
|
|
|
|
<update id="updateByIds" >
|