Merge branch 'feature/form_statistics_05' into 'develop'

修改回款明细-退费未完成展示出现的问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!38

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

@@ -44,9 +44,10 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				financeRefund.refund_Explain AS remark ,\r\n"
 				+ "				financeRefund.regional_Company AS regionalCompanyId,\r\n"
 				+ "				CASE WHEN financeRefund.fund_Type = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END  AS fundType1 \r\n"
-				+ "			FROM\r\n" + "				xyst_dinas_finance_refund AS financeRefund\r\n"
+				+ "			FROM\r\n" + "	xyst_dinas_finance_refund AS financeRefund\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+				+"              WHERE financeRefund.refund_state = 'REFUNDED'  \r\n"
 				+ "UNION ALL\r\n" + "		    "
 				+ " SELECT\r\n"
 				+ "				DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
@@ -199,6 +200,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "			FROM\r\n" + "				xyst_dinas_finance_refund AS financeRefund\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchase_Sand_Company\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = financeRefund.project \r\n"
+				+"              WHERE financeRefund.refund_state = 'REFUNDED'  \r\n"
 				+ "UNION ALL\r\n" + "		    SELECT\r\n"
 				+ "				DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"