@@ -149,31 +168,31 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
StringBuilderhql=newStringBuilder("select ");
hql.append(" result.purchaseSandUnit AS purchaseSandUnit, \r\n"
+" result.project AS project,\r\n"
+" result.lastYearAdvance AS lastYearAdvance,\r\n"
+" result.paymentSales AS paymentSales,\r\n"
+" result.totalAdvancePayment AS totalAdvancePayment,\r\n"
+" result.refundAmount AS refundAmount,\r\n"
+" result.advanceBalance AS advanceBalance,\r\n"
+" result.janAmount as janAmount,\r\n"
+" result.febAmount as febAmount,\r\n"
+" result.marAmount as marAmount,\r\n"
+" result.aprAmount as aprAmount,\r\n"
+" result.mayAmount as mayAmount,\r\n"
+" result.junAmount as junAmount,\r\n"
+" result.julAmount as julAmount,\r\n"
+" result.augAmount as augAmount,\r\n"
+" result.septAmount as septAmount,\r\n"
+" result.octAmount as octAmount,\r\n"
+" result.novAmount as novAmount,\r\n"
+" result.decAmount as decAmount ");
+" FORMAT( result.lastYearAdvance ,2 ) AS lastYearAdvance,\r\n"
+" FORMAT( result.paymentSales ,2 ) AS paymentSales,\r\n"
+" FORMAT( result.totalAdvancePayment ,2 ) AS totalAdvancePayment,\r\n"
+" FORMAT( result.refundAmount ,2 ) AS refundAmount,\r\n"
+" FORMAT( result.advanceBalance ,2 ) AS advanceBalance,\r\n"
+" FORMAT( result.janAmount ,2 ) as janAmount,\r\n"
+" FORMAT( result.febAmount ,2 ) as febAmount,\r\n"
+" FORMAT( result.marAmount ,2 ) as marAmount,\r\n"
+" FORMAT( result.aprAmount ,2 ) as aprAmount,\r\n"
+" FORMAT( result.mayAmount ,2 ) as mayAmount,\r\n"
+" FORMAT( result.junAmount ,2 ) as junAmount,\r\n"
+" FORMAT( result.julAmount ,2 ) as julAmount,\r\n"
+" FORMAT( result.augAmount ,2 ) as augAmount,\r\n"
+" FORMAT( result.septAmount ,2 ) as septAmount,\r\n"
+" FORMAT( result.octAmount ,2 ) as octAmount,\r\n"
+" FORMAT( result.novAmount ,2 ) as novAmount,\r\n"
+" FORMAT( result.decAmount ,2 ) as decAmount ");
hql.append(" FROM ");
hql.append(" (SELECT purchaseSandCompany.NAME AS purchaseSandUnit,\r\n"
+" projectFiled.project_Name AS project,\r\n"
+" SUM(advancePaymentAndBalanceSummary.last_Year_Advance) AS lastYearAdvance,\r\n"
+" advancePaymentAdvance1.last_Year_Advance AS lastYearAdvance,\r\n"
+" SUM(advancePaymentAndBalanceSummary.payment_sales) AS paymentSales,\r\n"
+" SUM(advancePaymentAndBalanceSummary.total_advance_payment) AS totalAdvancePayment,\r\n"
+" SUM(advancePaymentAndBalanceSummary.advance_payment_refund_amount + advancePaymentAndBalanceSummary.margin_refund) AS refundAmount,\r\n"
+" SUM(advancePaymentAndBalanceSummary.advance_balance) AS advanceBalance,\r\n"
+" advancePaymentAdvance.advance_balance AS advanceBalance,\r\n"
+" janAmount.janAmount1 as janAmount,\r\n"
+" febAmount.febAmount1 as febAmount,\r\n"
+" marAmount.marAmount1 as marAmount,\r\n"
...
...
@@ -192,7 +211,34 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
+" xyst_dinas_statistics_advancepayment_Balance_summary AS advancePaymentAndBalanceSummary\r\n"
+" LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompany ON purchaseSandCompany.id = advancePaymentAndBalanceSummary.purchase_sand_unit_id\r\n"
+" LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = advancePaymentAndBalanceSummary.project_id\r\n"
+" LEFT JOIN(\r\n"+" SELECT\r\n"
+" LEFT JOIN ( SELECT\r\n"
+" advancePayment.advance_balance AS advance_balance,\r\n"
+" advancePayment.purchase_sand_unit_id AS purchase_sand_unit_id,\r\n"
+" advancePayment.project_id AS project_id \r\n"+" FROM\r\n"
+" xyst_dinas_statistics_advancepayment_Balance_summary AS advancePayment \r\n"
+" WHERE\r\n"
+" advancePayment.deal_time IN ( SELECT MAX( advancePayment1.deal_time ) FROM xyst_dinas_statistics_advancepayment_Balance_summary AS advancePayment1"
+" where 1=1 ");
if(dealYear!=null&&!(dealYear.isEmpty()))
hql.append(" and advancePayment1.deal_year = :dealYear ");
hql.append(" GROUP BY advancePayment1.purchase_sand_unit_id, advancePayment1.project_id ) \r\n"
+" ) AS advancePaymentAdvance ON advancePaymentAdvance.purchase_sand_unit_id = advancePaymentAndBalanceSummary.purchase_sand_unit_id \r\n"
+" AND advancePaymentAdvance.project_id = advancePaymentAndBalanceSummary.project_id "
+"LEFT JOIN (\r\n"
+" SELECT\r\n"
+" sum(advancePayment.last_Year_Advance) AS last_Year_Advance,\r\n"
+" advancePayment.purchase_sand_unit_id AS purchase_sand_unit_id,\r\n"
+" advancePayment.project_id AS project_id \r\n"
+" FROM\r\n"
+" xyst_dinas_statistics_advancepayment_Balance_summary AS advancePayment \r\n"
+" WHERE 1=1 \r\n");
if(dealYear!=null&&!(dealYear.isEmpty()))hql.append(" and advancePayment.deal_year = :dealYear \r\n");
hql.append(" GROUP BY advancePayment.purchase_sand_unit_id,advancePayment.project_id\r\n"
+" ) AS advancePaymentAdvance1 ON advancePaymentAdvance1.purchase_sand_unit_id = advancePaymentAndBalanceSummary.purchase_sand_unit_id \r\n"
+" AND advancePaymentAdvance1.project_id = advancePaymentAndBalanceSummary.project_id "
+" LEFT JOIN( SELECT\r\n"
+" SUM( advancePaymentAndBalanceSummary1.payment_Sales ) AS janAmount1 ,\r\n"
+" advancePaymentAndBalanceSummary1.project_id AS project1,\r\n"
+" advancePaymentAndBalanceSummary1.deal_Year AS dealYear1,\r\n"
...
...
@@ -514,27 +560,27 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum