Merge branch 'feature/form_statistics_05' into 'develop'

销售汇总报表保留两位小数

See merge request kunlun/xyst_dinas/xyst_dinas_backend!48

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

@@ -32,15 +32,23 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
 	public List<SalesSummary> loadSalesSummaryByConditions(String dealYear, String stationList) {
 		// TODO Auto-generated method stub
 		StringBuilder hql = new StringBuilder("select ");
-		hql.append(" result.station AS station,\r\n" + "			result.dinasType AS dinasType,\r\n"
-				+ "			result.saleDealAmount AS saleDealAmount,\r\n"
-				+ "			result.saleAmount AS saleAmount,\r\n" + "			result.avgAmount AS avgAmount,\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(" 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)   ");
 		hql.append(" FROM  ");
 		hql.append(" (\r\n" + "			SELECT\r\n" + "				'总计' as station,\r\n"
 				+ "				'--' as dinasType,\r\n"