预付款及结余汇总 余额修改

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

@@ -56,7 +56,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 		hql.append("xx.f1 as f, ");// 本年销售货款
 		hql.append("sum( xx.g1 ) as g, ");// 预付款总额
 		hql.append("sum( xx.h1 ) as h, ");// 预付款退款额
-		hql.append("xx.i1 as i , ");// 预付款余额
+		hql.append("sum( xx.i1 ) as i , ");// 预付款余额
 		hql.append("sum( xx.j1 ) as j , ");// 保证金总额
 		hql.append("sum(xx.q1) as q , ");// 保证金退款额
 		hql.append("xx.dealMount as dealMount ");// 销售数量
@@ -176,7 +176,11 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 		hql.append(
 				"LEFT JOIN  xyst_dinas_project_purchase_sand_company  as PURCHASESANDUNIT ON PURCHASESANDUNIT.regional_company = REGIONALCOMPANY.id   ");// 购砂单位
 		hql.append(
-				"LEFT JOIN xyst_dinas_contract_master as CONTRACT ON CONTRACT.purchase_sand_Unit_id = PURCHASESANDUNIT.id   "
+				"LEFT JOIN (select SS.* from xyst_dinas_contract_master AS SS\r\n"
+				+ "INNER JOIN	(\r\n"
+				+ "SELECT SUBSTRING_INDEX(GROUP_CONCAT(aa.id ORDER BY modify_time DESC),',',1) id FROM xyst_dinas_contract_master as aa\r\n"
+				+ "GROUP BY aa.project_id\r\n"
+				+ ") as bb on bb.id = SS.id) as CONTRACT ON CONTRACT.purchase_sand_Unit_id = PURCHASESANDUNIT.id   "
 				+ " AND ( CONTRACT.contract_state = 'EXECUTING' or CONTRACT.contract_state = 'COMPLETED' or CONTRACT.contract_state = 'MODIFIED' ) ");// 合同
 		hql.append("LEFT JOIN xyst_dinas_project_filed  as PROJECT on CONTRACT.project_id = PROJECT.id  ");// 项目
 		hql.append("LEFT JOIN xyst_dinas_sales_record AS SALESRECODE ON SALESRECODE.project_id = PROJECT.id   ")