Merge branch 'feature/form_statistics_05' into 'develop'

销售汇总不显示问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!49

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

@@ -34,21 +34,21 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
 		StringBuilder hql = new StringBuilder("select ");
 		hql.append(" result.station AS station,\r\n"
 		        + "			result.dinasType AS dinasType,\r\n"
-				+ "			FORMAT( result.saleDealAmount AS saleDealAmount , 2),\r\n"
-				+ "			FORMAT( result.saleAmount AS saleAmount , 2),\r\n" 
-				+ "			FORMAT( result.avgAmount AS avgAmount , 2),\r\n"
-				+ "			FORMAT( result.janAmount AS janAmount , 2),\r\n" 
-				+ "			FORMAT( result.febAmount AS febAmount , 2),\r\n"
-				+ "			FORMAT( result.marAmount AS marAmount , 2),\r\n" 
-				+ "			FORMAT( result.aprAmount AS aprAmount , 2),\r\n"
-				+ "			FORMAT( result.mayAmount AS mayAmount , 2),\r\n" 
-				+ "			FORMAT( result.junAmount AS junAmount , 2),\r\n"
-				+ "			FORMAT( result.julAmount AS julAmount , 2),\r\n" 
-				+ "			FORMAT( result.augAmount AS augAmount , 2),\r\n"
-				+ "			FORMAT( result.septAmount AS septAmount , 2),\r\n" 
-				+ "			FORMAT( result.octAmount AS octAmount , 2),\r\n"
-				+ "			FORMAT( result.novAmount AS novAmount , 2),\r\n" 
-				+ "			FORMAT( result.decAmount AS decAmount , 2)   ");
+				+ "			FORMAT( result.saleDealAmount , 2) AS saleDealAmount,\r\n"
+				+ "			FORMAT( result.saleAmount , 2) AS saleAmount,\r\n" 
+				+ "			FORMAT( result.avgAmount , 2) AS avgAmount ,\r\n"
+				+ "			FORMAT( result.janAmount , 2) AS janAmount ,\r\n" 
+				+ "			FORMAT( result.febAmount , 2) AS febAmount ,\r\n"
+				+ "			FORMAT( result.marAmount , 2) AS marAmount ,\r\n" 
+				+ "			FORMAT( result.aprAmount , 2) AS aprAmount ,\r\n"
+				+ "			FORMAT( result.mayAmount , 2) AS mayAmount ,\r\n" 
+				+ "			FORMAT( result.junAmount , 2) AS junAmount ,\r\n"
+				+ "			FORMAT( result.julAmount , 2) AS julAmount ,\r\n" 
+				+ "			FORMAT( result.augAmount , 2) AS augAmount ,\r\n"
+				+ "			FORMAT( result.septAmount , 2) AS septAmount,\r\n" 
+				+ "			FORMAT( result.octAmount , 2) AS octAmount,\r\n"
+				+ "			FORMAT( result.novAmount , 2) AS novAmount,\r\n" 
+				+ "			FORMAT( result.decAmount , 2) AS decAmount   ");
 		hql.append(" FROM  ");
 		hql.append(" (\r\n" + "			SELECT\r\n" + "				'总计' as station,\r\n"
 				+ "				'--' as dinasType,\r\n"