Merge branch 'feature/form_statistics_05' into 'develop'

解决回款明细 资金类型无法按照类别查询问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!33

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

@@ -38,7 +38,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				financeRefund.actual_Refund_Amount AS actualRefundAmount,\r\n"
 				+ "				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"
+				+ "				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"
 				+ "				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"
@@ -88,7 +88,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 		if (project != null && !(project.isEmpty()))
 			hql.append(" and result.project like ").append( " :project " );
 		if (fundType != null && !(fundType.isEmpty()))
-			hql.append(" and result.fundType =  :fundType ");
+			hql.append(" and result.fundType1 =  :fundType ");
 		hql.append(" 	ORDER BY result.createTime DESC ");
 		return (List<PaymentDetails>) template.execute(new HibernateCallback<List<PaymentDetails>>() {
 			@Override