Merge branch 'feature/form_statistics_05' into 'develop'

修改区域公司匹配不到问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!37

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

@@ -492,7 +492,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 				+ "					) AS result ");
 		hql.append(" WHERE 1=1 ");
 		if (regionalCompany != null && !(regionalCompany.isEmpty()))
-			hql.append(" AND result.regionalCompany = :regionalCompany ");
+			hql.append(" AND hex(result.regionalCompany) = :regionalCompany ");
 		if (dealYear != null && !(dealYear.isEmpty()))
 			hql.append(" AND result.dealYear = :dealYear ");
 		hql.append(" order BY result.purchaseSandUnit = '合计' ASC,result.purchaseSandUnit,result.project ");
@@ -504,7 +504,7 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 						if (dealYear != null && !(dealYear.isEmpty()))
 							query.setParameter("dealYear", dealYear);
 						if (regionalCompany != null && !(regionalCompany.isEmpty()))
-							query.setParameter("regionalCompany", regionalCompany);
+							query.setParameter("regionalCompany", regionalCompany.replace("-", ""));
 						List<Tuple> resultList = query.getResultList();
 						if (resultList.isEmpty())
 							return null;

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

@@ -42,7 +42,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 			hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 					+ "	    SUM( salesSummary.sale_Amount ) AS saleAmount, ");
 		}		
-		hql.append("  salesSummary.deal_Time as dealTime, station.id as stationId \r\n"
+		hql.append("  DATE_FORMAT(salesSummary.deal_Time , '%Y-%m-%d' ) as dealTime, station.id as stationId \r\n"
 				+ "	  FROM  xyst_dinas_statistics_sale_summary AS salesSummary \r\n"
 				+ "	  LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id \r\n"
 				+ "	  LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_type_id  ");
@@ -69,7 +69,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 			hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 					+ "	    SUM( salesSummary.sale_Amount ) AS saleAmount, ");
 		}
-		hql.append("   salesSummary.deal_Time as dealTime, station.id as stationId \r\n"
+		hql.append("   DATE_FORMAT(salesSummary.deal_Time , '%Y-%m-%d' ) as dealTime, station.id as stationId \r\n"
 				+ "	   FROM	xyst_dinas_statistics_sale_summary AS salesSummary\r\n"
 				+ "	   LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id\r\n"
 				+ "	   LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_type_id ");
@@ -95,7 +95,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 			hql.append("	SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 					+ "	    SUM( salesSummary.sale_Amount ) AS saleAmount, ");
 		}
-		hql.append("      salesSummary.deal_Time as dealTime, \r\n" + "      station.id as stationId \r\n"
+		hql.append("      DATE_FORMAT(salesSummary.deal_Time , '%Y-%m-%d' ) as dealTime, \r\n" + "      station.id as stationId \r\n"
 				+ "	     FROM \r\n" + "      xyst_dinas_statistics_sale_summary AS salesSummary \r\n"
 				+ "      LEFT JOIN xyst_dinas_biz_station AS station ON station.id = salesSummary.station_id \r\n"
 				+ "      LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_type_id ");

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

@@ -33,7 +33,8 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 		hql.append(" result.actualRefundAmount AS actualRefundAmount , ");// 退款金额
 		hql.append(" result.remark  AS remark  ");// 备注
 		hql.append(" FROM ( ");
-		hql.append("			SELECT\r\n" + "				financeRefund.create_Time AS createTime,\r\n"
+		hql.append("			SELECT  \r\n"
+				+ "             DATE_FORMAT(financeRefund.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN financeRefund.fund_Type = 1 THEN\r\n"
@@ -46,8 +47,9 @@ 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"
-				+ "UNION ALL\r\n" + "		    SELECT\r\n"
-				+ "				artificialRecharge.create_Time AS createTime,\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"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN artificialRecharge.fund_Type = 'DEPOSIT' THEN\r\n"
@@ -60,8 +62,9 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				xyst_dinas_finance_artificial_recharge AS artificialRecharge\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchase_Sand_Unit\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = artificialRecharge.project \r\n"
-				+ "UNION ALL\r\n" + "			SELECT\r\n"
-				+ "				expenseAdjust.create_Time AS createTime,\r\n"
+				+ "UNION ALL\r\n" + "			"
+				+ " SELECT\r\n"
+				+ "				DATE_FORMAT(expenseAdjust.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN expenseAdjust.fund_Type = 'DEPOSIT' THEN\r\n"
@@ -81,7 +84,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				 \r\n" + "			)  AS result  ");
 		hql.append(" WHERE 1=1 ");
 		if (regionalCompany != null && !(regionalCompany.isEmpty()))
-			hql.append(" and result.regionalCompanyId = :regionalCompany ");
+			hql.append(" and hex(result.regionalCompanyId) = :regionalCompany ");
 		if (startDate != null && !(startDate.isEmpty()))
 			hql.append(" and result.createTime >= :startDate ");
 		if (endDate != null && !(endDate.isEmpty()))
@@ -93,6 +96,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 			hql.append(" and result.project like ").append(" :project ");
 		if (fundType != null && !(fundType.isEmpty()))
 			hql.append(" and result.fundType1 =  :fundType ");
+		
 		hql.append(" 	ORDER BY result.createTime DESC ");
 		return (List<PaymentDetails>) template.execute(new HibernateCallback<List<PaymentDetails>>() {
 			@Override
@@ -109,7 +113,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				if (fundType != null && !(fundType.isEmpty()))
 					query.setParameter("fundType", fundType);
 				if (regionalCompany != null && !(regionalCompany.isEmpty()))
-					query.setParameter("regionalCompany", regionalCompany);
+					query.setParameter("regionalCompany", regionalCompany.replace("-", ""));
 				List<Tuple> resultList;
 				if (pageInfo != null) { // 分页
 					// 当前端没有传 currentPage pageSize 值为0
@@ -181,7 +185,8 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 		StringBuilder hql = new StringBuilder("select ");
 		hql.append(" COUNT(*) ");// 备注
 		hql.append(" FROM ( ");
-		hql.append("			SELECT\r\n" + "				financeRefund.create_Time AS createTime,\r\n"
+		hql.append("			SELECT\r\n"
+				+ "             DATE_FORMAT(financeRefund.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN financeRefund.fund_Type = 1 THEN\r\n"
@@ -195,7 +200,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				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"
 				+ "UNION ALL\r\n" + "		    SELECT\r\n"
-				+ "				artificialRecharge.create_Time AS createTime,\r\n"
+				+ "				DATE_FORMAT(artificialRecharge.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN artificialRecharge.fund_Type = 'DEPOSIT' THEN\r\n"
@@ -209,7 +214,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				LEFT JOIN xyst_dinas_project_purchase_sand_company AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchase_Sand_Unit\r\n"
 				+ "				LEFT JOIN xyst_dinas_project_filed AS projectFiled ON projectFiled.id = artificialRecharge.project \r\n"
 				+ "UNION ALL\r\n" + "			SELECT\r\n"
-				+ "				expenseAdjust.create_Time AS createTime,\r\n"
+				+ "				DATE_FORMAT(expenseAdjust.create_Time, '%Y-%m-%d' ) AS createTime,\r\n"
 				+ "				purchaseSandCompanyon.NAME AS purchaseSandUnit,\r\n"
 				+ "				projectFiled.project_Name AS project,\r\n" + "			CASE\r\n"
 				+ "					\r\n" + "					WHEN expenseAdjust.fund_Type = 'DEPOSIT' THEN\r\n"
@@ -229,7 +234,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				+ "				 \r\n" + "			)  AS result  ");
 		hql.append(" WHERE 1=1 ");
 		if (regionalCompany != null && !(regionalCompany.isEmpty()))
-			hql.append(" and result.regionalCompanyId = :regionalCompany ");
+			hql.append(" and hex(result.regionalCompanyId) = :regionalCompany ");
 		if (startDate != null && !(startDate.isEmpty()))
 			hql.append(" and result.createTime >= :startDate ");
 		if (endDate != null && !(endDate.isEmpty()))
@@ -257,7 +262,7 @@ public class PaymentDetailsDaoImpl implements PaymentDetailsDao {
 				if (fundType != null && !(fundType.isEmpty()))
 					query.setParameter("fundType", fundType);
 				if (regionalCompany != null && !(regionalCompany.isEmpty()))
-					query.setParameter("regionalCompany", regionalCompany);
+					query.setParameter("regionalCompany", regionalCompany.replace("-", ""));
 				List<Tuple> resultList= query.getResultList();
 				return resultList;
 			}