Merge branch 'feature/form_statistics_05' into 'develop'

预付款及结余汇总 退款额成倍问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!80

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/AdvancePaymentBalanceSumDaoImpl.java

@@ -287,7 +287,9 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 				+ " 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"
+				hql.append( " GROUP BY advancePayment1.purchase_sand_unit_id, advancePayment1.project_id )"
+						+ " GROUP BY advancePayment.project_id \r\n"
+						+ "		,advancePayment.purchase_sand_unit_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 "