Merge branch 'feature/form_statistics_05' into 'develop'

预付款及结余汇总修改跑批条件-新增 合同完成状态，已变更状态的数据

See merge request kunlun/xyst_dinas/xyst_dinas_backend!78

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

@@ -83,7 +83,8 @@ 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    AND CONTRACT.contract_state = 'EXECUTING' ");// 合同
+				"LEFT JOIN xyst_dinas_contract_master 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   ")
 				.append("AND  SALESRECODE.regional_company_id = REGIONALCOMPANY.id   ")
@@ -128,7 +129,8 @@ 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    AND CONTRACT.contract_state = 'EXECUTING' ");// 合同
+				"LEFT JOIN xyst_dinas_contract_master 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   ")
 				.append("AND  SALESRECODE.regional_company_id = REGIONALCOMPANY.id   ")
@@ -174,7 +176,8 @@ 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    AND CONTRACT.contract_state = 'EXECUTING' ");// 合同
+				"LEFT JOIN xyst_dinas_contract_master 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   ")
 				.append("AND  SALESRECODE.regional_company_id = REGIONALCOMPANY.id   ")