Merge branch 'feature/form_statistics_05' into 'develop'

修改统计查询与EXCEL下载 数据为null时的格式错误问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!28

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

@@ -140,29 +140,30 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 	}
 
 	@Override
-	public List<AdvancePaymentBalanceSum> queryAdvancePaymentBalanceSumByConditions(String dealYear,String regionalCompany) {
+	public List<AdvancePaymentBalanceSum> queryAdvancePaymentBalanceSumByConditions(String dealYear,
+			String regionalCompany) {
 		// TODO Auto-generated method stub
 		StringBuilder hql = new StringBuilder("select ");
-		hql.append(
-				"result.purchaseSandUnit AS purchaseSandUnit,\r\n" + "					result.project AS project,\r\n"
-						+ "					result.lastYearAdvance AS lastYearAdvance,\r\n"
-						+ "					result.paymentSales AS paymentSales,\r\n"
-						+ "					result.totalAdvancePayment AS totalAdvancePayment,\r\n"
-						+ "					result.refundAmount AS refundAmount,\r\n"
-						+ "					result.advanceBalance AS advanceBalance,\r\n"
-						+ "					result.janAmount as janAmount,\r\n"
-						+ "					result.febAmount as febAmount,\r\n"
-						+ "					result.marAmount as marAmount,\r\n"
-						+ "					result.aprAmount as aprAmount,\r\n"
-						+ "					result.mayAmount as mayAmount,\r\n"
-						+ "					result.junAmount as junAmount,\r\n"
-						+ "					result.julAmount as julAmount,\r\n"
-						+ "					result.augAmount as augAmount,\r\n"
-						+ "					result.septAmount as septAmount,\r\n"
-						+ "					result.octAmount as octAmount,\r\n"
-						+ "					result.novAmount as novAmount,\r\n"
-						+ "					result.decAmount as decAmount");
-		hql.append("FROM ");
+		hql.append("                result.purchaseSandUnit AS purchaseSandUnit,   \r\n"
+				+ "                 result.project AS project,\r\n"
+				+ "					result.lastYearAdvance AS lastYearAdvance,\r\n"
+				+ "					result.paymentSales AS paymentSales,\r\n"
+				+ "					result.totalAdvancePayment AS totalAdvancePayment,\r\n"
+				+ "					result.refundAmount AS refundAmount,\r\n"
+				+ "					result.advanceBalance AS advanceBalance,\r\n"
+				+ "					result.janAmount as janAmount,\r\n"
+				+ "					result.febAmount as febAmount,\r\n"
+				+ "					result.marAmount as marAmount,\r\n"
+				+ "					result.aprAmount as aprAmount,\r\n"
+				+ "					result.mayAmount as mayAmount,\r\n"
+				+ "					result.junAmount as junAmount,\r\n"
+				+ "					result.julAmount as julAmount,\r\n"
+				+ "					result.augAmount as augAmount,\r\n"
+				+ "					result.septAmount as septAmount,\r\n"
+				+ "					result.octAmount as octAmount,\r\n"
+				+ "					result.novAmount as novAmount,\r\n"
+				+ "					result.decAmount as decAmount  ");
+		hql.append("  FROM ");
 		hql.append(" (SELECT        purchaseSandCompany.NAME AS purchaseSandUnit,\r\n"
 				+ "					projectFiled.project_Name AS project,\r\n"
 				+ "					SUM(advancePaymentAndBalanceSummary.last_Year_Advance) AS lastYearAdvance,\r\n"
@@ -510,25 +511,101 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
 						List<AdvancePaymentBalanceSum> list = new ArrayList<AdvancePaymentBalanceSum>();
 						for (Tuple resule : resultList) {
 							AdvancePaymentBalanceSum advancePaymentBalanceSum = new AdvancePaymentBalanceSum();
-							advancePaymentBalanceSum.setPurchaseSandUnit(String.valueOf(resule.get(0)));
-							advancePaymentBalanceSum.setProject(String.valueOf(resule.get(1)));
-							advancePaymentBalanceSum.setLastYearAdvance(String.valueOf(resule.get(2)));
-							advancePaymentBalanceSum.setPaymentSales(String.valueOf(resule.get(3)));
-							advancePaymentBalanceSum.setTotalAdvancePayment(String.valueOf(resule.get(4)));
-							advancePaymentBalanceSum.setRefundAmount(String.valueOf(resule.get(5)));
-							advancePaymentBalanceSum.setAdvanceBalance(String.valueOf(resule.get(6)));
-							advancePaymentBalanceSum.setJanAmount(String.valueOf(resule.get(7)));
-							advancePaymentBalanceSum.setFebAmount(String.valueOf(resule.get(8)));
-							advancePaymentBalanceSum.setMarAmount(String.valueOf(resule.get(9)));
-							advancePaymentBalanceSum.setAprAmount(String.valueOf(resule.get(10)));
-							advancePaymentBalanceSum.setMayAmount(String.valueOf(resule.get(11)));
-							advancePaymentBalanceSum.setJunAmount(String.valueOf(resule.get(12)));
-							advancePaymentBalanceSum.setJulAmount(String.valueOf(resule.get(13)));
-							advancePaymentBalanceSum.setAugAmount(String.valueOf(resule.get(14)));
-							advancePaymentBalanceSum.setSeptAmount(String.valueOf(resule.get(15)));
-							advancePaymentBalanceSum.setOctAmount(String.valueOf(resule.get(16)));
-							advancePaymentBalanceSum.setNovAmount(String.valueOf(resule.get(17)));
-							advancePaymentBalanceSum.setDecAmount(String.valueOf(resule.get(18)));
+							if (String.valueOf(resule.get(0)) != "null" ) {
+								advancePaymentBalanceSum.setPurchaseSandUnit(String.valueOf(resule.get(0)));
+							} else {
+								advancePaymentBalanceSum.setPurchaseSandUnit(null);
+							}
+							if (String.valueOf(resule.get(1)) != "null" ) {
+								advancePaymentBalanceSum.setProject(String.valueOf(resule.get(1)));
+							} else {
+								advancePaymentBalanceSum.setProject(null);
+							}
+							if (String.valueOf(resule.get(2)) != "null" ) {
+								advancePaymentBalanceSum.setLastYearAdvance(String.valueOf(resule.get(2)));
+							} else {
+								advancePaymentBalanceSum.setLastYearAdvance(null);
+							}
+							if (String.valueOf(resule.get(3)) != "null" ) {
+								advancePaymentBalanceSum.setPaymentSales(String.valueOf(resule.get(3)));
+							} else {
+								advancePaymentBalanceSum.setPaymentSales(null);
+							}
+							if (String.valueOf(resule.get(4)) != "null" ) {
+								advancePaymentBalanceSum.setTotalAdvancePayment(String.valueOf(resule.get(4)));
+							} else {
+								advancePaymentBalanceSum.setTotalAdvancePayment(null);
+							}
+							if (String.valueOf(resule.get(5)) != "null") {
+								advancePaymentBalanceSum.setRefundAmount(String.valueOf(resule.get(5)));
+							} else {
+								advancePaymentBalanceSum.setRefundAmount(null);
+							}
+							if (String.valueOf(resule.get(6)) != "null" ) {
+								advancePaymentBalanceSum.setAdvanceBalance(String.valueOf(resule.get(6)));
+							} else {
+								advancePaymentBalanceSum.setAdvanceBalance(null);
+							}
+							if (String.valueOf(resule.get(7)) != "null" ) {
+								advancePaymentBalanceSum.setJanAmount(String.valueOf(resule.get(7)));
+							} else {
+								advancePaymentBalanceSum.setJanAmount(null);
+							}
+							if (String.valueOf(resule.get(8)) != "null" ) {
+								advancePaymentBalanceSum.setFebAmount(String.valueOf(resule.get(8)));
+							} else {
+								advancePaymentBalanceSum.setFebAmount(null);
+							}
+							if (String.valueOf(resule.get(9)) != "null" ) {
+								advancePaymentBalanceSum.setMarAmount(String.valueOf(resule.get(9)));
+							} else {
+								advancePaymentBalanceSum.setMarAmount(null);
+							}
+							if (String.valueOf(resule.get(10)) != "null" ) {
+								advancePaymentBalanceSum.setAprAmount(String.valueOf(resule.get(10)));
+							} else {
+								advancePaymentBalanceSum.setAprAmount(null);
+							}
+							if (String.valueOf(resule.get(11)) != "null") {
+								advancePaymentBalanceSum.setMayAmount(String.valueOf(resule.get(11)));
+							} else {
+								advancePaymentBalanceSum.setMayAmount(null);
+							}
+							if (String.valueOf(resule.get(12)) != "null" ) {
+								advancePaymentBalanceSum.setJunAmount(String.valueOf(resule.get(12)));
+							} else {
+								advancePaymentBalanceSum.setJunAmount(null);
+							}
+							if (String.valueOf(resule.get(13)) != "null" ) {
+								advancePaymentBalanceSum.setJulAmount(String.valueOf(resule.get(13)));
+							} else {
+								advancePaymentBalanceSum.setJulAmount(null);
+							}
+							if (String.valueOf(resule.get(14)) != "null" ) {
+								advancePaymentBalanceSum.setAugAmount(String.valueOf(resule.get(14)));
+							} else {
+								advancePaymentBalanceSum.setAugAmount(null);
+							}
+							if (String.valueOf(resule.get(15)) != "null" ) {
+								advancePaymentBalanceSum.setSeptAmount(String.valueOf(resule.get(15)));
+							} else {
+								advancePaymentBalanceSum.setSeptAmount(null);
+							}
+							if (String.valueOf(resule.get(16)) != "null" ) {
+								advancePaymentBalanceSum.setOctAmount(String.valueOf(resule.get(16)));
+							} else {
+								advancePaymentBalanceSum.setOctAmount(null);
+							}
+							if (String.valueOf(resule.get(17)) != "null" ) {
+								advancePaymentBalanceSum.setNovAmount(String.valueOf(resule.get(17)));
+							} else {
+								advancePaymentBalanceSum.setNovAmount(null);
+							}
+							if (String.valueOf(resule.get(18)) != "null" ) {
+								advancePaymentBalanceSum.setDecAmount(String.valueOf(resule.get(18)));
+							} else {
+								advancePaymentBalanceSum.setDecAmount(null);
+							}
 							list.add(advancePaymentBalanceSum);
 						}
 						return list;

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

@@ -22,7 +22,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 
 	@Override
 	public List<OperationsReports> loadOperationsReportsByConditions(String startDate, String endDate,
-			String OperationsReportType, String stationList ) {
+			String OperationsReportType, String stationList) {
 		// TODO Auto-generated method stub
 		StringBuffer hql = new StringBuffer(" SELECT ");
 		hql.append(" result.stationName AS stationName, result.dinasTypeName AS dinasTypeName,\r\n"
@@ -48,12 +48,10 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 			hql.append(" and salesSummary.deal_Time <= :endDate  ");
 		if (stationList != null && !(stationList.isEmpty()))
 			hql.append(" AND station.id IN :stationList ");
-		hql.append("  GROUP BY	salesSummary.station_id,\r\n"
-				+ "	  salesSummary.dinas_type_id ");
+		hql.append("  GROUP BY	salesSummary.station_id,\r\n" + "	  salesSummary.dinas_type_id ");
 		hql.append("  UNION ALL ");
-		hql.append( "  SELECT \r\n"
-				+ "	   station.station_Name AS stationName, \r\n"
-				+ "	   '小计' AS dinasTypeName,  ");
+		hql.append(
+				"  SELECT \r\n" + "	   station.station_Name AS stationName, \r\n" + "	   '小计' AS dinasTypeName,  ");
 		if (OperationsReportType.equals("daily")) {
 			hql.append("  SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
 					+ "   SUM( salesSummary.sale_Amount ) AS saleAmount, ");
@@ -74,9 +72,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 		if (stationList != null && !(stationList.isEmpty()))
 			hql.append(" AND station.id IN :stationList ");
 		hql.append(" GROUP BY  salesSummary.station_id ");
-		hql.append("   UNION ALL " );
-		hql.append("   SELECT  '总计' AS stationName, \r\n"
-				+ "	   '———' AS dinasTypeName, ");
+		hql.append("   UNION ALL ");
+		hql.append("   SELECT  '总计' AS stationName, \r\n" + "	   '———' AS dinasTypeName, ");
 		if (OperationsReportType.equals("daily")) {
 			hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount,\r\n"
 					+ "	 SUM( salesSummary.sale_Amount ) AS saleAmount, ");
@@ -85,10 +82,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 					+ "   FORMAT(  SUM( salesSummary.sale_Amount ) / 10000  ,2) AS saleAmount, ");
 		}
 
-		hql.append("      salesSummary.deal_Time as dealTime, \r\n"
-				+ "      station.id as stationId \r\n" 
-				+ "	     FROM \r\n"
-				+ "      xyst_dinas_statistics_sale_summary AS salesSummary \r\n"
+		hql.append("      salesSummary.deal_Time 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 ");
 		hql.append("	where  1=1 ");
@@ -118,10 +113,26 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
 				List<OperationsReports> list = new ArrayList<OperationsReports>();
 				for (Tuple resule : resultList) {
 					OperationsReports operationsReports = new OperationsReports();
-					operationsReports.setStationName(String.valueOf(resule.get(0)));
-					operationsReports.setDinasTypeName(String.valueOf(resule.get(1)));
-					operationsReports.setSaleDealAmount(String.valueOf(resule.get(2)));
-					operationsReports.setSaleAmount(String.valueOf(resule.get(3)));
+					if (String.valueOf(resule.get(0)) != "null") {
+						operationsReports.setStationName(String.valueOf(resule.get(0)));
+					} else {
+						operationsReports.setStationName(null);
+					}
+					if (String.valueOf(resule.get(1)) != "null") {
+						operationsReports.setDinasTypeName(String.valueOf(resule.get(1)));
+					} else {
+						operationsReports.setDinasTypeName(null);
+					}
+					if (String.valueOf(resule.get(2)) != "null") {
+						operationsReports.setSaleDealAmount(String.valueOf(resule.get(2)));
+					} else {
+						operationsReports.setSaleDealAmount(null);
+					}
+					if (String.valueOf(resule.get(3)) != "null") {
+						operationsReports.setSaleAmount(String.valueOf(resule.get(3)));
+					} else {
+						operationsReports.setSaleAmount(null);
+					}
 					list.add(operationsReports);
 				}
 				return list;

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

@@ -431,23 +431,91 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
 				List<SalesSummary> list = new ArrayList<SalesSummary>();
 				for (Tuple resule : resultList) {
 					SalesSummary salesSummary = new SalesSummary();
-					salesSummary.setStation(String.valueOf(resule.get(0)));
-					salesSummary.setDinasType(String.valueOf(resule.get(1)));
-					salesSummary.setSaleDealAmount(String.valueOf(resule.get(2)));
-					salesSummary.setSaleAmount(String.valueOf(resule.get(3)));
-					salesSummary.setAvgAmount(String.valueOf(resule.get(4)));
-					salesSummary.setJanAmount(String.valueOf(resule.get(5)));
-					salesSummary.setFebAmount(String.valueOf(resule.get(6)));
-					salesSummary.setMarAmount(String.valueOf(resule.get(7)));
-					salesSummary.setAprAmount(String.valueOf(resule.get(8)));
-					salesSummary.setMayAmount(String.valueOf(resule.get(9)));
-					salesSummary.setJunAmount(String.valueOf(resule.get(10)));
-					salesSummary.setJulAmount(String.valueOf(resule.get(11)));
-					salesSummary.setAugAmount(String.valueOf(resule.get(12)));
-					salesSummary.setSeptAmount(String.valueOf(resule.get(13)));
-					salesSummary.setOctAmount(String.valueOf(resule.get(14)));
-					salesSummary.setNovAmount(String.valueOf(resule.get(15)));
-					salesSummary.setDecAmount(String.valueOf(resule.get(16)));
+					if (String.valueOf(resule.get(0)) != "null") {
+						salesSummary.setStation(String.valueOf(resule.get(0)));
+					} else {
+						salesSummary.setStation(null);
+					}
+					if (String.valueOf(resule.get(1)) != "null") {
+						salesSummary.setDinasType(String.valueOf(resule.get(1)));
+					} else {
+						salesSummary.setDinasType(null);
+					}
+					if (String.valueOf(resule.get(2)) != "null") {
+						salesSummary.setSaleDealAmount(String.valueOf(resule.get(2)));
+					} else {
+						salesSummary.setSaleDealAmount(null);
+					}
+					if (String.valueOf(resule.get(3)) != "null") {
+						salesSummary.setSaleAmount(String.valueOf(resule.get(3)));
+					} else {
+						salesSummary.setSaleAmount(null);
+					}
+					if (String.valueOf(resule.get(4)) != "null") {
+						salesSummary.setAvgAmount(String.valueOf(resule.get(4)));
+					} else {
+						salesSummary.setAvgAmount(null);
+					}
+					if (String.valueOf(resule.get(5)) != "null") {
+						salesSummary.setJanAmount(String.valueOf(resule.get(5)));
+					} else {
+						salesSummary.setJanAmount(null);
+					}
+					if (String.valueOf(resule.get(6)) != "null") {
+						salesSummary.setFebAmount(String.valueOf(resule.get(6)));
+					} else {
+						salesSummary.setFebAmount(null);
+					}
+					if (String.valueOf(resule.get(7)) != "null") {
+						salesSummary.setMarAmount(String.valueOf(resule.get(7)));
+					} else {
+						salesSummary.setMarAmount(null);
+					}
+					if (String.valueOf(resule.get(8)) != "null") {
+						salesSummary.setAprAmount(String.valueOf(resule.get(8)));
+					} else {
+						salesSummary.setAprAmount(null);
+					}
+					if (String.valueOf(resule.get(9)) != "null") {
+						salesSummary.setMayAmount(String.valueOf(resule.get(9)));
+					} else {
+						salesSummary.setMayAmount(null);
+					}
+					if (String.valueOf(resule.get(10)) != "null") {
+						salesSummary.setJunAmount(String.valueOf(resule.get(10)));
+					} else {
+						salesSummary.setJunAmount(null);
+					}
+					if (String.valueOf(resule.get(11)) != "null") {
+						salesSummary.setJulAmount(String.valueOf(resule.get(11)));
+					} else {
+						salesSummary.setJulAmount(null);
+					}
+					if (String.valueOf(resule.get(12)) != "null") {
+						salesSummary.setAugAmount(String.valueOf(resule.get(12)));
+					} else {
+						salesSummary.setAugAmount(null);
+					}
+					if (String.valueOf(resule.get(13)) != "null") {
+						salesSummary.setSeptAmount(String.valueOf(resule.get(13)));
+					} else {
+						salesSummary.setSeptAmount(null);
+					}
+					if (String.valueOf(resule.get(14)) != "null") {
+						salesSummary.setOctAmount(String.valueOf(resule.get(14)));
+					} else {
+						salesSummary.setOctAmount(null);
+					}
+					if (String.valueOf(resule.get(15)) != "null") {
+						salesSummary.setNovAmount(String.valueOf(resule.get(15)));
+					} else {
+						salesSummary.setNovAmount(null);
+					}
+					if (String.valueOf(resule.get(16)) != "null") {
+						salesSummary.setDecAmount(String.valueOf(resule.get(16)));
+					} else {
+						salesSummary.setDecAmount(null);
+					}
 					list.add(salesSummary);
 				}
 				return list;