潘钊 / bsth_control · Commits

Commit f3388a126eb47c154998a6a604de4fe7e9015fe9

Authored by 娄高锋
1 parent ca0b7775

BUG修复

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
  View file @f3388a1
@@ -872,7 +872,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen @@ -872,7 +872,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen
872 // TODO Auto-generated catch block 872 // TODO Auto-generated catch block
873 e.printStackTrace(); 873 e.printStackTrace();
874 } 874 }
875 - List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31"); 875 + List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
876 876
877 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>(); 877 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
878 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>(); 878 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
@@ -1303,7 +1303,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1303,7 +1303,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1303 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>(); 1303 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
1304 Map<String, Boolean> lineNature = lineService.lineNature(); 1304 Map<String, Boolean> lineNature = lineService.lineNature();
1305 List<Budget> findByYear = repository.findByYear(year); 1305 List<Budget> findByYear = repository.findByYear(year);
1306 - List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-01-31"); 1306 + List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-12-31");
1307 1307
1308 String year_1 = ""; 1308 String year_1 = "";
1309 try { 1309 try {
@@ -1312,8 +1312,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1312,8 +1312,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1312 // TODO Auto-generated catch block 1312 // TODO Auto-generated catch block
1313 e.printStackTrace(); 1313 e.printStackTrace();
1314 } 1314 }
1315 - List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-01-31");  
1316 - List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31"); 1315 + List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-12-31");
  1316 + List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
1317 1317
1318 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>(); 1318 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
1319 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>(); 1319 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
@@ -1798,8 +1798,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen @@ -1798,8 +1798,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1798 // TODO Auto-generated catch block 1798 // TODO Auto-generated catch block
1799 e.printStackTrace(); 1799 e.printStackTrace();
1800 } 1800 }
1801 - List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-01-31");  
1802 - List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31"); 1801 + List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-12-31");
  1802 + List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
1803 1803
1804 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>(); 1804 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
1805 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>(); 1805 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();