Commit 7f88e0b7 by wukaiqiang

Merge branch 'feature/form_statistics_05' into 'develop'

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

See merge request kunlun/xyst_dinas/xyst_dinas_backend!28
parents fd1a989e 608c3f9c
...@@ -140,11 +140,12 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum ...@@ -140,11 +140,12 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
} }
@Override @Override
public List<AdvancePaymentBalanceSum> queryAdvancePaymentBalanceSumByConditions(String dealYear,String regionalCompany) { public List<AdvancePaymentBalanceSum> queryAdvancePaymentBalanceSumByConditions(String dealYear,
String regionalCompany) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
StringBuilder hql = new StringBuilder("select "); StringBuilder hql = new StringBuilder("select ");
hql.append( hql.append(" result.purchaseSandUnit AS purchaseSandUnit, \r\n"
"result.purchaseSandUnit AS purchaseSandUnit,\r\n" + " result.project AS project,\r\n" + " result.project AS project,\r\n"
+ " result.lastYearAdvance AS lastYearAdvance,\r\n" + " result.lastYearAdvance AS lastYearAdvance,\r\n"
+ " result.paymentSales AS paymentSales,\r\n" + " result.paymentSales AS paymentSales,\r\n"
+ " result.totalAdvancePayment AS totalAdvancePayment,\r\n" + " result.totalAdvancePayment AS totalAdvancePayment,\r\n"
...@@ -161,8 +162,8 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum ...@@ -161,8 +162,8 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
+ " result.septAmount as septAmount,\r\n" + " result.septAmount as septAmount,\r\n"
+ " result.octAmount as octAmount,\r\n" + " result.octAmount as octAmount,\r\n"
+ " result.novAmount as novAmount,\r\n" + " result.novAmount as novAmount,\r\n"
+ " result.decAmount as decAmount"); + " result.decAmount as decAmount ");
hql.append("FROM "); hql.append(" FROM ");
hql.append(" (SELECT purchaseSandCompany.NAME AS purchaseSandUnit,\r\n" hql.append(" (SELECT purchaseSandCompany.NAME AS purchaseSandUnit,\r\n"
+ " projectFiled.project_Name AS project,\r\n" + " projectFiled.project_Name AS project,\r\n"
+ " SUM(advancePaymentAndBalanceSummary.last_Year_Advance) AS lastYearAdvance,\r\n" + " SUM(advancePaymentAndBalanceSummary.last_Year_Advance) AS lastYearAdvance,\r\n"
...@@ -510,25 +511,101 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum ...@@ -510,25 +511,101 @@ public class AdvancePaymentBalanceSumDaoImpl implements AdvancePaymentBalanceSum
List<AdvancePaymentBalanceSum> list = new ArrayList<AdvancePaymentBalanceSum>(); List<AdvancePaymentBalanceSum> list = new ArrayList<AdvancePaymentBalanceSum>();
for (Tuple resule : resultList) { for (Tuple resule : resultList) {
AdvancePaymentBalanceSum advancePaymentBalanceSum = new AdvancePaymentBalanceSum(); AdvancePaymentBalanceSum advancePaymentBalanceSum = new AdvancePaymentBalanceSum();
if (String.valueOf(resule.get(0)) != "null" ) {
advancePaymentBalanceSum.setPurchaseSandUnit(String.valueOf(resule.get(0))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); advancePaymentBalanceSum.setDecAmount(String.valueOf(resule.get(18)));
} else {
advancePaymentBalanceSum.setDecAmount(null);
}
list.add(advancePaymentBalanceSum); list.add(advancePaymentBalanceSum);
} }
return list; return list;
......
...@@ -22,7 +22,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -22,7 +22,7 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
@Override @Override
public List<OperationsReports> loadOperationsReportsByConditions(String startDate, String endDate, public List<OperationsReports> loadOperationsReportsByConditions(String startDate, String endDate,
String OperationsReportType, String stationList ) { String OperationsReportType, String stationList) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
StringBuffer hql = new StringBuffer(" SELECT "); StringBuffer hql = new StringBuffer(" SELECT ");
hql.append(" result.stationName AS stationName, result.dinasTypeName AS dinasTypeName,\r\n" hql.append(" result.stationName AS stationName, result.dinasTypeName AS dinasTypeName,\r\n"
...@@ -48,12 +48,10 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -48,12 +48,10 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
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" hql.append(" GROUP BY salesSummary.station_id,\r\n" + " salesSummary.dinas_type_id ");
+ " salesSummary.dinas_type_id ");
hql.append(" UNION ALL "); hql.append(" UNION ALL ");
hql.append( " SELECT \r\n" hql.append(
+ " station.station_Name AS stationName, \r\n" " SELECT \r\n" + " station.station_Name AS stationName, \r\n" + " '小计' AS dinasTypeName, ");
+ " '小计' AS dinasTypeName, ");
if (OperationsReportType.equals("daily")) { if (OperationsReportType.equals("daily")) {
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, ");
...@@ -74,9 +72,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -74,9 +72,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
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" hql.append(" SELECT '总计' AS stationName, \r\n" + " '———' AS dinasTypeName, ");
+ " '———' AS dinasTypeName, ");
if (OperationsReportType.equals("daily")) { if (OperationsReportType.equals("daily")) {
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, ");
...@@ -85,10 +82,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -85,10 +82,8 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
+ " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, "); + " FORMAT( SUM( salesSummary.sale_Amount ) / 10000 ,2) AS saleAmount, ");
} }
hql.append(" salesSummary.deal_Time as dealTime, \r\n" hql.append(" salesSummary.deal_Time as dealTime, \r\n" + " station.id as stationId \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"
+ " LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_type_id "); + " LEFT JOIN xyst_dinas_biz_dinas_type AS dinasType ON dinasType.id = salesSummary.dinas_type_id ");
hql.append(" where 1=1 "); hql.append(" where 1=1 ");
...@@ -118,10 +113,26 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao { ...@@ -118,10 +113,26 @@ public class OperationsReportsDaoImpl implements OperationsReportsDao {
List<OperationsReports> list = new ArrayList<OperationsReports>(); List<OperationsReports> list = new ArrayList<OperationsReports>();
for (Tuple resule : resultList) { for (Tuple resule : resultList) {
OperationsReports operationsReports = new OperationsReports(); OperationsReports operationsReports = new OperationsReports();
if (String.valueOf(resule.get(0)) != "null") {
operationsReports.setStationName(String.valueOf(resule.get(0))); 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))); 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))); 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))); operationsReports.setSaleAmount(String.valueOf(resule.get(3)));
} else {
operationsReports.setSaleAmount(null);
}
list.add(operationsReports); list.add(operationsReports);
} }
return list; return list;
......
...@@ -431,23 +431,91 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao { ...@@ -431,23 +431,91 @@ public class SalesSummaryDaoImpl implements SalesSummaryDao {
List<SalesSummary> list = new ArrayList<SalesSummary>(); List<SalesSummary> list = new ArrayList<SalesSummary>();
for (Tuple resule : resultList) { for (Tuple resule : resultList) {
SalesSummary salesSummary = new SalesSummary(); SalesSummary salesSummary = new SalesSummary();
if (String.valueOf(resule.get(0)) != "null") {
salesSummary.setStation(String.valueOf(resule.get(0))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); 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))); salesSummary.setDecAmount(String.valueOf(resule.get(16)));
} else {
salesSummary.setDecAmount(null);
}
list.add(salesSummary); list.add(salesSummary);
} }
return list; return list;
......
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