|
@@ -1941,6 +1941,7 @@
|
|
|
SELECT
|
|
|
c.f_name AS fName,
|
|
|
DATE_FORMAT(w.f_review_date,'%Y-%m') AS reviewDate,
|
|
|
+ DATE_FORMAT(t.f_bstime,'%Y-%m') AS f_bstime,
|
|
|
sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) fAmount,
|
|
|
sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END ) fStlamount,
|
|
|
sum( CASE f_dc WHEN 'D' THEN f_amount ELSE 0 END ) - sum( CASE f_dc WHEN 'C' THEN f_amount ELSE 0 END ) nnfinished
|
|
@@ -1964,6 +1965,9 @@
|
|
|
<if test='timeExamine != null and timeExamine[0] != null and timeExamine[0]!= ""'>
|
|
|
and DATE_FORMAT(w.f_review_date, '%Y-%m') between #{timeExamine[0]} and #{timeExamine[1]}
|
|
|
</if>
|
|
|
+ <if test="fBstimeExamine != null and fBstimeExamine[0] != null and fBstimeExamine[0]!= ''">
|
|
|
+ and DATE_FORMAT(t.f_bstime, '%Y-%m') between #{fBstimeExamine[0]} and #{fBstimeExamine[1]}
|
|
|
+ </if>
|
|
|
<if test='fReconciliation!= null and fReconciliation != "" and fReconciliation == "0" '>
|
|
|
and ifnull(w.f_amount, 0) - ifnull(w.f_stlamount, 0) != 0
|
|
|
</if>
|
|
@@ -2765,7 +2769,7 @@
|
|
|
|
|
|
<select id="selectFinancialLedgerList" resultMap="feeVOResult">
|
|
|
SELECT
|
|
|
- c.f_name AS f_fees_name, w.f_corpid, w.f_mblno, w.f_billstatus, DATE_FORMAT(w.f_review_date,'%Y-%m') AS reviewDate,
|
|
|
+ c.f_name AS f_fees_name, w.f_corpid, w.f_mblno, w.f_billstatus, DATE_FORMAT(w.f_review_date,'%Y-%m') AS reviewDate,DATE_FORMAT(t.f_bstime,'%Y-%m') AS f_bstime,
|
|
|
SUM( w.f_amount ) AS f_amount, SUM( w.f_stlamount ) AS f_stlamount,SUM( w.f_accamount ) AS f_accamount,SUM( w.f_invamount ) AS f_invamount,
|
|
|
ifnull( SUM( w.f_amount ), 0 ) - ifnull( SUM( w.f_stlamount ), 0 ) AS nnfinished
|
|
|
FROM
|
|
@@ -2796,6 +2800,9 @@
|
|
|
<if test="timeExamine != null and timeExamine[0] != null and timeExamine[0]!= ''">
|
|
|
and DATE_FORMAT(w.f_review_date, '%Y-%m') between #{timeExamine[0]} and #{timeExamine[1]}
|
|
|
</if>
|
|
|
+ <if test="fBstimeExamine != null and fBstimeExamine[0] != null and fBstimeExamine[0]!= ''">
|
|
|
+ and DATE_FORMAT(t.f_bstime, '%Y-%m') between #{fBstimeExamine[0]} and #{fBstimeExamine[1]}
|
|
|
+ </if>
|
|
|
${params.dataScope}
|
|
|
</where>
|
|
|
GROUP BY
|