Skip to content

C
cloud-fb
Commit b85ba5b7 by wukaiqiang
Options

Merge branch 'feature/form_statistics_05' into 'develop' 

Feature/form statistics 05

See merge request kunlun/xyst_dinas/xyst_dinas_backend!29
parents 7f88e0b7 046eed59
Showing with 42 additions and 26 deletions
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/OperationsReportsDaoImpl.java
...@@ -30,13 +30,18 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -30,13 +30,18 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
+ " result.saleAmount AS saleAmount FROM "); + " result.saleAmount AS saleAmount FROM ");
hql.append(" ( SELECT station.station_Name AS stationName, \r\n " hql.append(" ( SELECT station.station_Name AS stationName, \r\n "
+ " dinasType.dinas_Type_Name AS dinasTypeName, "); + " dinasType.dinas_Type_Name AS dinasTypeName, ");
if (OperationsReportType.equals("daily")) { if (OperationsReportType != null && OperationsReportType != "" ) {
if (OperationsReportType.equals("daily")) {
hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
+ " SUM( salesSummary.sale_Amount ) AS saleAmount, ");
} else {
hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, ");
}
}else {
hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n" hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
+ " SUM( salesSummary.sale_Amount ) AS saleAmount, "); + " SUM( salesSummary.sale_Amount ) AS saleAmount, ");
} else { }
hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, ");
}
hql.append(" salesSummary.deal_Time as dealTime, station.id as stationId \r\n" hql.append(" salesSummary.deal_Time as dealTime, station.id as stationId \r\n"
+ " FROM xyst_dinas_statistics_sale_summary AS salesSummary \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_station AS station ON station.id = salesSummary.station_id \r\n"
...@@ -47,19 +52,23 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -47,19 +52,23 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
if (endDate != null && !(endDate.isEmpty())) if (endDate != null && !(endDate.isEmpty()))
hql.append(" and salesSummary.deal_Time <= :endDate "); hql.append(" and salesSummary.deal_Time <= :endDate ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" AND station.id IN :stationList "); 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(" UNION ALL ");
hql.append( hql.append(
" SELECT \r\n" + " station.station_Name AS stationName, \r\n" + " '小计' AS dinasTypeName, "); " SELECT \r\n" + " station.station_Name AS stationName, \r\n" + " '小计' AS dinasTypeName, ");
if (OperationsReportType.equals("daily")) { if (OperationsReportType != null && OperationsReportType != "" ) {
hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n" if (OperationsReportType.equals("daily")) {
+ " SUM( salesSummary.sale_Amount ) AS saleAmount, "); hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
} else { + " SUM( salesSummary.sale_Amount ) AS saleAmount, ");
hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount,\r\n" } else {
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, "); hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, ");
}
}else {
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(" salesSummary.deal_Time as dealTime, station.id as stationId \r\n"
+ " FROM xyst_dinas_statistics_sale_summary AS salesSummary\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_station AS station ON station.id = salesSummary.station_id\r\n"
...@@ -70,18 +79,22 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -70,18 +79,22 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
if (endDate != null && !(endDate.isEmpty())) if (endDate != null && !(endDate.isEmpty()))
hql.append(" and salesSummary.deal_Time <= :endDate "); hql.append(" and salesSummary.deal_Time <= :endDate ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" AND station.id IN :stationList "); hql.append(" AND station.id IN ( :stationList ) ");
hql.append(" GROUP BY salesSummary.station_id "); hql.append(" GROUP BY salesSummary.station_id ");
hql.append(" UNION ALL "); hql.append(" UNION ALL ");
hql.append(" SELECT '总计' AS stationName, \r\n" + " '———' AS dinasTypeName, "); hql.append(" SELECT '总计' AS stationName, \r\n" + " '———' AS dinasTypeName, ");
if (OperationsReportType.equals("daily")) { if (OperationsReportType != null && OperationsReportType != "" ) {
hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount,\r\n" if (OperationsReportType.equals("daily")) {
+ " SUM( salesSummary.sale_Amount ) AS saleAmount, "); hql.append(" SUM( salesSummary.sale_Deal_Amount ) AS saleDealAmount, \r\n"
} else { + " SUM( salesSummary.sale_Amount ) AS saleAmount, ");
hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount,\r\n" } else {
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, "); hql.append(" FORMAT( SUM( salesSummary.sale_Deal_Amount ) / 10000 ,2) AS saleDealAmount, \r\n"
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, ");
}
}else {
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(" 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" + " 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_station AS station ON station.id = salesSummary.station_id \r\n"
...@@ -92,7 +105,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -92,7 +105,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
if (endDate != null && !(endDate.isEmpty())) if (endDate != null && !(endDate.isEmpty()))
hql.append(" and salesSummary.deal_Time <= :endDate "); hql.append(" and salesSummary.deal_Time <= :endDate ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" AND station.id IN :stationList "); hql.append(" AND station.id IN ( :stationList ) ");
hql.append(" ) AS result "); hql.append(" ) AS result ");
hql.append( hql.append(
" ORDER BY (result.stationName = '总计') DESC,result.stationName, (result.dinasTypeName = '小计') ASC "); " ORDER BY (result.stationName = '总计') DESC,result.stationName, (result.dinasTypeName = '小计') ASC ");
...@@ -111,6 +124,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -111,6 +124,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
if (resultList.isEmpty()) if (resultList.isEmpty())
return null; return null;
List<OperationsReports> list = new ArrayList<OperationsReports>(); List<OperationsReports> list = new ArrayList<OperationsReports>();
if(list.size() > 1) {
for (Tuple resule : resultList) { for (Tuple resule : resultList) {
OperationsReports operationsReports = new OperationsReports(); OperationsReports operationsReports = new OperationsReports();
if (String.valueOf(resule.get(0)) != "null") { if (String.valueOf(resule.get(0)) != "null") {
...@@ -135,6 +149,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -135,6 +149,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
} }
list.add(operationsReports); list.add(operationsReports);
} }
}
return list; return list;
} }
}); });
......
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/internal/dao/SalesSummaryDaoImpl.java
...@@ -159,7 +159,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -159,7 +159,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
+ " GROUP BY salesSummary1.station_id\r\n" + " GROUP BY salesSummary1.station_id\r\n"
+ " ) AS decAmount ON decAmount.dealYear1 = salesSummary.deal_Year "); + " ) AS decAmount ON decAmount.dealYear1 = salesSummary.deal_Year ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" WHERE 1=1 AND station.id IN :stationList "); hql.append(" WHERE 1=1 AND station.id IN ( :stationList ) ");
hql.append(" GROUP BY salesSummary.deal_Year\r\n" + " UNION ALL\r\n" + " SELECT\r\n" hql.append(" GROUP BY salesSummary.deal_Year\r\n" + " UNION ALL\r\n" + " SELECT\r\n"
+ " station.station_Name as station,\r\n" + " '小计' as dinas_Type,\r\n" + " station.station_Name as station,\r\n" + " '小计' as dinas_Type,\r\n"
+ " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n" + " SUM(salesSummary.sale_Deal_Amount) as saleDealAmount,\r\n"
...@@ -278,7 +278,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -278,7 +278,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
+ " ) AS decAmount ON decAmount.station1 = salesSummary.station_id\r\n" + " ) AS decAmount ON decAmount.station1 = salesSummary.station_id\r\n"
+ " AND decAmount.dealYear1 = salesSummary.deal_Year "); + " AND decAmount.dealYear1 = salesSummary.deal_Year ");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" WHERE 1=1 AND station.id IN :stationList "); hql.append(" WHERE 1=1 AND station.id IN ( :stationList ) ");
hql.append(" GROUP BY salesSummary.station_id\r\n" + " UNION ALL\r\n" + " SELECT\r\n" hql.append(" GROUP BY salesSummary.station_id\r\n" + " UNION ALL\r\n" + " SELECT\r\n"
+ " station.station_Name as station,\r\n" + " station.station_Name as station,\r\n"
+ " dinasType.dinas_Type_Name as dinasType,\r\n" + " dinasType.dinas_Type_Name as dinasType,\r\n"
...@@ -411,7 +411,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -411,7 +411,7 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
+ " ) AS decAmount ON decAmount.station1 = salesSummary.station_id AND decAmount.dinasType1 = salesSummary.dinas_Type_id\r\n" + " ) AS decAmount ON decAmount.station1 = salesSummary.station_id AND decAmount.dinasType1 = salesSummary.dinas_Type_id\r\n"
+ " AND decAmount.dealYear1 = salesSummary.deal_Year"); + " AND decAmount.dealYear1 = salesSummary.deal_Year");
if (stationList != null && !(stationList.isEmpty())) if (stationList != null && !(stationList.isEmpty()))
hql.append(" WHERE 1=1 AND station.id IN :stationList "); hql.append(" WHERE 1=1 AND station.id IN ( :stationList ) ");
hql.append(" GROUP BY salesSummary.dinas_Type_id " + " ) AS result "); hql.append(" GROUP BY salesSummary.dinas_Type_id " + " ) AS result ");
hql.append(" WHERE 1=1 "); hql.append(" WHERE 1=1 ");
if (dealYear != null && !(dealYear.isEmpty())) if (dealYear != null && !(dealYear.isEmpty()))
......
backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/web/DownLoadStatisticsController.java
...@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
...@@ -19,7 +20,7 @@ public class DownLoadStatisticsController { ...@@ -19,7 +20,7 @@ public class DownLoadStatisticsController {
@Autowired @Autowired
DownLoadStatisticsService downLoadStatisticsService; DownLoadStatisticsService downLoadStatisticsService;
@RequestMapping(value ="/DownLoadStatistics/downLoadStatisticsService", method = RequestMethod.GET) @PostMapping(value ="/DownLoadStatistics/downLoadStatisticsService", consumes = "application/json")
public void downLoadStatisticsService(HttpServletResponse response, HttpServletRequest request, public void downLoadStatisticsService(HttpServletResponse response, HttpServletRequest request,
@RequestBody ConditionsDetailsInfo conditionsDetailsInfo) { @RequestBody ConditionsDetailsInfo conditionsDetailsInfo) {
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment