|
|
@@ -436,7 +436,7 @@
|
|
|
select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.type_other typeOther,
|
|
|
a.attachment_url attachmentUrl ,a.real_amount realAmount,e.contract_no contractNo,tm.buyer_name buyerName,
|
|
|
a.secondary_type secondaryType, a.secondary_type_other secondaryTypeOther,a.status,a.user_names userNames,
|
|
|
- date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,a.user_names userNames,
|
|
|
+ date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,a.user_names userNames,a.amount,
|
|
|
date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr,
|
|
|
<if test="processStatus ==1">
|
|
|
eae.type eaeType,
|
|
|
@@ -575,7 +575,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectExpenseAccountTotalAmount" resultType="java.math.BigDecimal">
|
|
|
- select sum(a.total_amount) totalAmount
|
|
|
+ select sum(a.amount) totalAmount
|
|
|
from expense_account a
|
|
|
<if test="type !=null">
|
|
|
right join (select a.id
|