潘钊 / bsth_control · Commits

Commit 6286a67612c9e9c51f1cda5b09167af35c427ef7

Authored by 娄高锋
1 parent 07c67de9
build: skipped

到离站报表站点筛选项排序问题修复，根据时间查询线路历史站点；油量进出场获取之前的进场油量作为出场油量时进场存油为0的也获取；预算报表导入公里异常修复；预算报表统计结果异常修复。

Inline Side-by-side
Showing 5 changed files with 174 additions and 165 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 5 of 14 files are displayed.

src/main/java/com/bsth/controller/report/ReportController.java
  View file @6286a67
... ... @@ -218,8 +218,9 @@ public class ReportController {
218 218 return new ArrayList<Map<String, Object>>();
219 219 }
220 220 @RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
221   - public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx) {
222   - return service.sreachZd(line,zdlx);
  221 + public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,
  222 + @RequestParam String date1,@RequestParam String date2) {
  223 + return service.sreachZd(line,zdlx,date1,date2);
223 224 }
224 225  
225 226  
... ...
src/main/java/com/bsth/repository/LsStationRouteRepository.java
  View file @6286a67
... ... @@ -3,7 +3,6 @@ package com.bsth.repository;
3 3 import java.util.List;
4 4 import java.util.Map;
5 5  
6   -import org.springframework.data.domain.Sort;
7 6 import org.springframework.data.jpa.repository.EntityGraph;
8 7 import org.springframework.data.jpa.repository.Modifying;
9 8 import org.springframework.data.jpa.repository.Query;
... ... @@ -11,7 +10,6 @@ import org.springframework.stereotype.Repository;
11 10 import org.springframework.transaction.annotation.Transactional;
12 11  
13 12 import com.bsth.entity.LsStationRoute;
14   -import com.bsth.entity.StationRoute;
15 13  
16 14 /**
17 15 *
... ... @@ -293,4 +291,14 @@ public interface LsStationRouteRepository extends BaseRepository&lt;LsStationRoute,
293 291  
294 292 @Query(value="select count(*) from bsth_c_ls_stationroute where line_code = ?1 and directions = ?2 and destroy = 0 and versions = ?3 ", nativeQuery=true)
295 293 int count(int line, int dir, int version);
  294 +
  295 + @Query(value = " select r.station_code, r.station_name, r.versions " +
  296 + "from bsth_c_ls_stationroute r where r.line_code = ?1 " +
  297 + "and r.directions=?2 and r.destroy = 0 and r.versions in(" +
  298 + "select v.versions from bsth_c_line_versions v where v.line_code=?1 " +
  299 + "and ((date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.start_date, '%Y-%m-%d') <= ?4) " +
  300 + " or (date_format(v.start_date, '%Y-%m-%d') <= ?4 and date_format(v.end_date, '%Y-%m-%d') >= ?4) " +
  301 + " or (date_format(v.start_date, '%Y-%m-%d') >= ?3 and date_format(v.end_date, '%Y-%m-%d') <= ?4))" +
  302 + ") order by r.versions desc, r.station_route_code asc ", nativeQuery = true)
  303 + List<Object[]> findHistory(String lineCode, Integer updown, String date1, String date2);
296 304 }
... ...
src/main/java/com/bsth/repository/StationRouteRepository.java
  View file @6286a67
... ... @@ -420,7 +420,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
420 420 @Query("select r from StationRoute r where r.line.id=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
421 421 List<StationRoute> findByLine(Integer lineId, Integer dir);
422 422  
423   - @Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and versions is not null order by r.destroy, r.stationRouteCode")
  423 + @Query("select r from StationRoute r where r.lineCode=?1 and r.directions=?2 and r.destroy=0 order by r.stationRouteCode")
424 424 List<StationRoute> findAllByLine(String lineCode, int updown);
425 425  
426 426 @EntityGraph(value = "stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
... ...
src/main/java/com/bsth/repository/oil/YlbRepository.java
  View file @6286a67
... ... @@ -47,7 +47,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
47 47 List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
48 48  
49 49 @Query(value="select * from bsth_c_ylb where "
50   - + " DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= rq "
  50 + + " DATE_SUB(CURDATE(), INTERVAL 60 DAY) <= rq "
51 51 + " and rq< ?1 and ssgsdm like %?2%"
52 52 + " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
53 53 + " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
... ...
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
  View file @6286a67
... ... @@ -150,7 +150,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
150 150  
151 151 for(int i = 0; i < textList.size(); i++){
152 152 String text = textList.get(i);
153   -// System.out.println(text);
154 153 String[] split = text.split(",");
155 154 int rowNo = Integer.valueOf(split[0].trim());
156 155 String year = split[1].trim();
... ... @@ -229,11 +228,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
229 228 Budget bud = budgets.get(0);
230 229 if(b.getFormalPerson() != null){
231 230 if(bud.getBudgetMileage() != null){
232   - bud.setChangeMileage(b.getFormalPerson());
  231 + bud.setChangeMileage(b.getFormalMileage());
233 232 } else {
234   - bud.setBudgetMileage(b.getFormalPerson());
  233 + bud.setBudgetMileage(b.getFormalMileage());
235 234 }
236   - bud.setFormalMileage(b.getFormalPerson());
  235 + bud.setFormalMileage(b.getFormalMileage());
237 236 }
238 237 if(b.getFormalPerson() != null){
239 238 if(bud.getBudgetPerson() != null){
... ... @@ -251,11 +250,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
251 250 }
252 251 bud.setFormalAmounts(b.getFormalAmounts());
253 252 }
254   - repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalPerson(),
  253 + repository.update(bud.getBudgetMileage(), bud.getChangeMileage(), bud.getFormalMileage(),
255 254 bud.getBudgetPerson(), bud.getChangePerson(), bud.getFormalPerson(),
256 255 bud.getBudgetAmounts(), bud.getChangeAmounts(), bud.getFormalAmounts(), bud.getId());
257 256 } else {
258   - b.setBudgetMileage(b.getFormalPerson());
  257 + b.setBudgetMileage(b.getFormalMileage());
259 258 b.setBudgetPerson(b.getFormalPerson());
260 259 b.setBudgetAmounts(b.getFormalAmounts());
261 260 insertList.add(b);
... ... @@ -380,7 +379,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
380 379 r.setXlName(lineAllMap.get(name).getName());
381 380 }
382 381 } else {
383   - boolean flag = true;
384 382 for(String key : lineAllMap.keySet()){
385 383 Line l = lineAllMap.get(key);
386 384 String name = l.getName();
... ... @@ -388,15 +386,11 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
388 386 name = name.replaceAll("区间", "") + l.getStartStationName().substring(0, 1);
389 387 }
390 388 if(l.getName().equals(lineName) || name.equals(lineName)){
391   - flag = false;
392 389 r.setXlBm(l.getLineCode());
393 390 r.setXlName(l.getName());
394 391 break;
395 392 }
396 393 }
397   -// if(flag){
398   -// System.out.println(m.get("lineName").toString() + " >> " + lineName);
399   -// }
400 394 }
401 395  
402 396 if(r.getXlBm() != null){
... ... @@ -432,6 +426,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
432 426 // TODO Auto-generated method stub
433 427 SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
434 428 SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
  429 + DecimalFormat df = new DecimalFormat("0.###");
435 430 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
436 431 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
437 432 Map<String, Boolean> lineNature = lineService.lineNature();
... ... @@ -474,9 +469,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
474 469 m.put("xlName", xlName);
475 470 m.put("sfyy", sfyy);
476 471 m.put("sfjc", sfjc);
477   - m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
478   - m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
479   - m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
  472 + m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
  473 + m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
  474 + m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
480 475 for(int i = 1; i <= 12; i++){
481 476 m.put("mon"+i, "");
482 477 m.put("bud"+i, "");
... ... @@ -494,28 +489,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
494 489 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
495 490 if(b.getBudgetMileage()!=null){
496 491 if(m.get("budget").toString().length() > 0){
497   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
498   - new BigDecimal(b.getBudgetMileage())).doubleValue());
  492 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  493 + new BigDecimal(b.getBudgetMileage())).doubleValue()));
499 494 } else {
500   - m.put("budget", b.getBudgetMileage());
  495 + m.put("budget", df.format(b.getBudgetMileage()));
501 496 }
502 497 }
503 498 if(b.getChangeMileage()!=null){
504 499 if(m.get("change").toString().length() > 0){
505   - m.put("change", new BigDecimal(m.get("change").toString()).add(
506   - new BigDecimal(b.getChangeMileage())).doubleValue());
  500 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  501 + new BigDecimal(b.getChangeMileage())).doubleValue()));
507 502 } else {
508   - m.put("change", b.getChangeMileage());
  503 + m.put("change", df.format(b.getChangeMileage()));
509 504 }
510 505 }
511 506 if(b.getFormalMileage()!=null){
512 507 if(m.get("formal").toString().length() > 0){
513   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
514   - new BigDecimal(b.getFormalMileage())).doubleValue());
  508 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  509 + new BigDecimal(b.getFormalMileage())).doubleValue()));
515 510 } else {
516   - m.put("formal", b.getFormalMileage());
  511 + m.put("formal", df.format(b.getFormalMileage()));
517 512 }
518   - m.put(bud, b.getFormalMileage());
  513 + m.put(bud, df.format(b.getFormalMileage()));
519 514 }
520 515 }
521 516 }
... ... @@ -611,6 +606,50 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
611 606 }
612 607 strList.add(gsBm + "_all");
613 608  
  609 + BigDecimal monAll = new BigDecimal("0");
  610 + BigDecimal preAll = new BigDecimal("0");
  611 + for(int i = 1; i <= 12; i++){
  612 + if(m.get("mon"+i).toString().length() > 0){
  613 + BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
  614 + monAll = monAll.add(val);
  615 + val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
  616 + m.put("mon"+i, val.doubleValue());
  617 + }
  618 + if(m.get("pre"+i).toString().length() > 0){
  619 + BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
  620 + preAll = preAll.add(val);
  621 + val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
  622 + m.put("pre"+i, val.doubleValue());
  623 + if(m.get("mon"+i).toString().length() > 0){
  624 + BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
  625 + BigDecimal sub = monVal.subtract(val);
  626 + m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
  627 + } else {
  628 + m.put("sub"+i, "-" + val.doubleValue());
  629 + }
  630 + }
  631 + }
  632 + monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
  633 + preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
  634 + Double subAll = monAll.subtract(preAll).doubleValue();
  635 + m.put("monAll", monAll.doubleValue());
  636 + m.put("preAll", preAll.doubleValue());
  637 + m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
  638 +
  639 + if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
  640 + && new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
  641 + BigDecimal formal = new BigDecimal(m.get("formal").toString());
  642 + m.put("complete", monAll.divide(
  643 + formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
  644 + new BigDecimal(100)).divide(
  645 + new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
  646 + BigDecimal diff = monAll.subtract(formal);
  647 + m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
  648 + } else {
  649 + m.put("complete", "");
  650 + m.put("diff", "");
  651 + }
  652 +
614 653 for(String str : strList){
615 654 if(!keyMap.containsKey(str)){
616 655 continue;
... ... @@ -652,7 +691,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
652 691 }
653 692 if(m.get(bud).toString().length() > 0){
654 693 if(map.get(bud).toString().length() > 0){
655   - map.put(mon, new BigDecimal(m.get(bud).toString()).add(
  694 + map.put(bud, new BigDecimal(m.get(bud).toString()).add(
656 695 new BigDecimal(map.get(bud).toString())).doubleValue());
657 696 } else {
658 697 map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
... ... @@ -670,50 +709,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
670 709 List<Map<String, Object>>dataList = (List<Map<String, Object>>)map.get("dataList");
671 710 dataList.add(m);
672 711 }
673   -
674   - BigDecimal monAll = new BigDecimal("0");
675   - BigDecimal preAll = new BigDecimal("0");
676   - for(int i = 1; i <= 12; i++){
677   - if(m.get("mon"+i).toString().length() > 0){
678   - BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
679   - monAll = monAll.add(val);
680   - val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
681   - m.put("mon"+i, val.doubleValue());
682   - }
683   - if(m.get("pre"+i).toString().length() > 0){
684   - BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
685   - preAll = preAll.add(val);
686   - val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
687   - m.put("pre"+i, val.doubleValue());
688   - if(m.get("mon"+i).toString().length() > 0){
689   - BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
690   - BigDecimal sub = monVal.subtract(val);
691   - m.put("sub"+i, sub.doubleValue() > 0 ? "+" + sub.doubleValue() : sub.doubleValue());
692   - } else {
693   - m.put("sub"+i, "-" + val.doubleValue());
694   - }
695   - }
696   - }
697   - monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
698   - preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
699   - Double subAll = monAll.subtract(preAll).doubleValue();
700   - m.put("monAll", monAll.doubleValue());
701   - m.put("preAll", preAll.doubleValue());
702   - m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
703   -
704   - if(m.get("formal").toString().length() > 0 && m.get("monAll").toString().length() > 0
705   - && new BigDecimal(m.get("formal").toString()).doubleValue() > 0d){
706   - BigDecimal formal = new BigDecimal(m.get("formal").toString());
707   - m.put("complete", monAll.divide(
708   - formal, 4, BigDecimal.ROUND_HALF_UP).multiply(
709   - new BigDecimal(100)).divide(
710   - new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP)+ "%");
711   - BigDecimal diff = monAll.subtract(formal);
712   - m.put("diff", diff.doubleValue() > 0 ? "+" + diff.doubleValue() : diff.doubleValue());
713   - } else {
714   - m.put("complete", "");
715   - m.put("diff", "");
716   - }
717 712 }
718 713  
719 714 for(String key : strs){
... ... @@ -764,14 +759,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
764 759 if(m.get("mon"+i).toString().length() > 0){
765 760 BigDecimal val = new BigDecimal(m.get("mon"+i).toString());
766 761 monAll = monAll.add(val);
767   - val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
768   - m.put("mon"+i, val.doubleValue());
769 762 }
770 763 if(m.get("pre"+i).toString().length() > 0){
771 764 BigDecimal val = new BigDecimal(m.get("pre"+i).toString());
772 765 preAll = preAll.add(val);
773   - val = val.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
774   - m.put("pre"+i, val.doubleValue());
775 766 if(m.get("mon"+i).toString().length() > 0){
776 767 BigDecimal monVal = new BigDecimal(m.get("mon"+i).toString());
777 768 BigDecimal sub = monVal.subtract(val);
... ... @@ -781,8 +772,6 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
781 772 }
782 773 }
783 774 }
784   - monAll = monAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
785   - preAll = preAll.divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP);
786 775 Double subAll = monAll.subtract(preAll).doubleValue();
787 776 m.put("monAll", monAll.doubleValue());
788 777 m.put("preAll", preAll.doubleValue());
... ... @@ -869,6 +858,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
869 858 // TODO Auto-generated method stub
870 859 SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
871 860 SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
  861 + DecimalFormat df = new DecimalFormat("0.###");
872 862 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
873 863 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
874 864 Map<String, Boolean> lineNature = lineService.lineNature();
... ... @@ -882,7 +872,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
882 872 // TODO Auto-generated catch block
883 873 e.printStackTrace();
884 874 }
885   - List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
  875 + List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-01-31");
886 876  
887 877 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
888 878 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
... ... @@ -911,9 +901,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
911 901 m.put("xlName", xlName);
912 902 m.put("sfyy", sfyy);
913 903 m.put("sfjc", sfjc);
914   - m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
915   - m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
916   - m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
  904 + m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
  905 + m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
  906 + m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
917 907 for(int i = 1; i <= 12; i++){
918 908 m.put("mon"+i, "");
919 909 m.put("bud"+i, "");
... ... @@ -931,28 +921,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
931 921 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
932 922 if(b.getBudgetPerson()!=null){
933 923 if(m.get("budget").toString().length() > 0){
934   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
935   - new BigDecimal(b.getBudgetPerson())).doubleValue());
  924 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  925 + new BigDecimal(b.getBudgetPerson())).doubleValue()));
936 926 } else {
937   - m.put("budget", b.getBudgetPerson());
  927 + m.put("budget", df.format(b.getBudgetPerson()));
938 928 }
939 929 }
940 930 if(b.getChangePerson()!=null){
941 931 if(m.get("change").toString().length() > 0){
942   - m.put("change", new BigDecimal(m.get("change").toString()).add(
943   - new BigDecimal(b.getChangePerson())).doubleValue());
  932 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  933 + new BigDecimal(b.getChangePerson())).doubleValue()));
944 934 } else {
945   - m.put("change", b.getChangePerson());
  935 + m.put("change", df.format(b.getChangePerson()));
946 936 }
947 937 }
948 938 if(b.getFormalPerson()!=null){
949 939 if(m.get("formal").toString().length() > 0){
950   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
951   - new BigDecimal(b.getFormalPerson())).doubleValue());
  940 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  941 + new BigDecimal(b.getFormalPerson())).doubleValue()));
952 942 } else {
953   - m.put("formal", b.getFormalPerson());
  943 + m.put("formal", df.format(b.getFormalPerson()));
954 944 }
955   - m.put(bud, b.getFormalPerson());
  945 + m.put(bud, df.format(b.getFormalPerson()));
956 946 }
957 947 }
958 948 }
... ... @@ -1091,7 +1081,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1091 1081 }
1092 1082 if(m.get(bud).toString().length() > 0){
1093 1083 if(map.get(bud).toString().length() > 0){
1094   - map.put(mon, new BigDecimal(m.get(bud).toString()).add(
  1084 + map.put(bud, new BigDecimal(m.get(bud).toString()).add(
1095 1085 new BigDecimal(map.get(bud).toString())).doubleValue());
1096 1086 } else {
1097 1087 map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
... ... @@ -1308,11 +1298,12 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1308 1298 // TODO Auto-generated method stub
1309 1299 SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
1310 1300 SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
  1301 + DecimalFormat df = new DecimalFormat("0.###");
1311 1302 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
1312 1303 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
1313 1304 Map<String, Boolean> lineNature = lineService.lineNature();
1314 1305 List<Budget> findByYear = repository.findByYear(year);
1315   - List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-12-31");
  1306 + List<Revenue> list = revenueRepository.findByDates(year+"-01-01", year+"-01-31");
1316 1307  
1317 1308 String year_1 = "";
1318 1309 try {
... ... @@ -1321,8 +1312,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1321 1312 // TODO Auto-generated catch block
1322 1313 e.printStackTrace();
1323 1314 }
1324   - List<CalcStatistics> scheduleList_1 = calcStatisticsRepository.selectByDateAndLineTj3(year_1+"-01-01", year_1+"-12-31");
1325   - List<Revenue> revenueList_1 = revenueRepository.findByDates(year_1+"-01-01", year_1+"-12-31");
  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");
1326 1317  
1327 1318 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
1328 1319 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
... ... @@ -1351,9 +1342,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1351 1342 m.put("xlName", xlName);
1352 1343 m.put("sfyy", sfyy);
1353 1344 m.put("sfjc", sfjc);
1354   - m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
1355   - m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
1356   - m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
  1345 + m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
  1346 + m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
  1347 + m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
1357 1348 for(int i = 1; i <= 12; i++){
1358 1349 m.put("mon"+i, "");
1359 1350 m.put("bud"+i, "");
... ... @@ -1372,28 +1363,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1372 1363 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1373 1364 if(b.getBudgetAmounts()!=null){
1374 1365 if(m.get("budget").toString().length() > 0){
1375   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
1376   - new BigDecimal(b.getBudgetAmounts())).doubleValue());
  1366 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  1367 + new BigDecimal(b.getBudgetAmounts())).doubleValue()));
1377 1368 } else {
1378   - m.put("budget", b.getBudgetAmounts());
  1369 + m.put("budget", df.format(b.getBudgetAmounts()));
1379 1370 }
1380 1371 }
1381 1372 if(b.getChangeAmounts()!=null){
1382 1373 if(m.get("change").toString().length() > 0){
1383   - m.put("change", new BigDecimal(m.get("change").toString()).add(
1384   - new BigDecimal(b.getChangeAmounts())).doubleValue());
  1374 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  1375 + new BigDecimal(b.getChangeAmounts())).doubleValue()));
1385 1376 } else {
1386   - m.put("change", b.getChangeAmounts());
  1377 + m.put("change", df.format(b.getChangeAmounts()));
1387 1378 }
1388 1379 }
1389 1380 if(b.getFormalAmounts()!=null){
1390 1381 if(m.get("formal").toString().length() > 0){
1391   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
1392   - new BigDecimal(b.getFormalAmounts())).doubleValue());
  1382 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  1383 + new BigDecimal(b.getFormalAmounts())).doubleValue()));
1393 1384 } else {
1394   - m.put("formal", b.getFormalAmounts());
  1385 + m.put("formal", df.format(b.getFormalAmounts()));
1395 1386 }
1396   - m.put(bud, b.getFormalAmounts());
  1387 + m.put(bud, df.format(b.getFormalAmounts()));
1397 1388 }
1398 1389 }
1399 1390 }
... ... @@ -1529,7 +1520,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1529 1520 }
1530 1521 }
1531 1522 for(int i = 1; i <= 12; i++){
1532   - String mon = "mon"+i, bud = "bud"+i;
  1523 + String mon = "mon"+i, bud = "bud"+i, pre = "pre"+i;
1533 1524 if(m.get(mon).toString().length() > 0){
1534 1525 if(map.get(mon).toString().length() > 0){
1535 1526 map.put(mon, new BigDecimal(m.get(mon).toString()).add(
... ... @@ -1540,12 +1531,20 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1540 1531 }
1541 1532 if(m.get(bud).toString().length() > 0){
1542 1533 if(map.get(bud).toString().length() > 0){
1543   - map.put(mon, new BigDecimal(m.get(bud).toString()).add(
  1534 + map.put(bud, new BigDecimal(m.get(bud).toString()).add(
1544 1535 new BigDecimal(map.get(bud).toString())).doubleValue());
1545 1536 } else {
1546 1537 map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
1547 1538 }
1548 1539 }
  1540 + if(m.get(pre).toString().length() > 0){
  1541 + if(map.get(pre).toString().length() > 0){
  1542 + map.put(pre, new BigDecimal(m.get(pre).toString()).add(
  1543 + new BigDecimal(map.get(pre).toString())).doubleValue());
  1544 + } else {
  1545 + map.put(pre, new BigDecimal(m.get(pre).toString()).doubleValue());
  1546 + }
  1547 + }
1549 1548 }
1550 1549 if(m.containsKey("num") && m.get("num").toString().length() > 0){
1551 1550 if(map.containsKey("num") && map.get("num").toString().length() > 0){
... ... @@ -1582,10 +1581,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1582 1581 }
1583 1582 }
1584 1583 }
1585   - BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
  1584 + monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
1586 1585 preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
1587   - Double subAll = monAll_.subtract(preAll).doubleValue();
1588   - m.put("monAll", monAll_.doubleValue());
  1586 + Double subAll = monAll.subtract(preAll).doubleValue();
  1587 + m.put("monAll", monAll.doubleValue());
1589 1588 m.put("preAll", preAll.doubleValue());
1590 1589 m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
1591 1590  
... ... @@ -1687,10 +1686,10 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1687 1686 }
1688 1687 }
1689 1688 }
1690   - BigDecimal monAll_ = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
  1689 + monAll = monAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
1691 1690 preAll = preAll.divide(new BigDecimal("1000000"), 3, BigDecimal.ROUND_HALF_UP);
1692   - Double subAll = monAll_.subtract(preAll).doubleValue();
1693   - m.put("monAll", monAll_.doubleValue());
  1691 + Double subAll = monAll.subtract(preAll).doubleValue();
  1692 + m.put("monAll", monAll.doubleValue());
1694 1693 m.put("preAll", preAll.doubleValue());
1695 1694 m.put("subAll", subAll > 0 ? "+" + subAll : subAll);
1696 1695  
... ... @@ -1784,6 +1783,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1784 1783 // TODO Auto-generated method stub
1785 1784 SimpleDateFormat sdfYY = new SimpleDateFormat("YYYY");
1786 1785 SimpleDateFormat sdfMM = new SimpleDateFormat("MM");
  1786 + DecimalFormat df = new DecimalFormat("0.###");
1787 1787 List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
1788 1788 Map<String, Map<String, Object>> keyMap = new HashMap<String, Map<String, Object>>();
1789 1789 List<Budget> findByYear = repository.findByYear(year);
... ... @@ -1798,8 +1798,8 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1798 1798 // TODO Auto-generated catch block
1799 1799 e.printStackTrace();
1800 1800 }
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");
  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");
1803 1803  
1804 1804 Map<String, Map<String, Object>> xlMap = new HashMap<String, Map<String, Object>>();
1805 1805 List<Map<String, Object>> xlList = new ArrayList<Map<String, Object>>();
... ... @@ -1834,9 +1834,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1834 1834 m.put("xlBm", xlBm);
1835 1835 m.put("xlName", xlName);
1836 1836 m.put("type", "公里");
1837   - m.put("budget", b.getBudgetMileage()!=null?b.getBudgetMileage():"");
1838   - m.put("change", b.getChangeMileage()!=null?b.getChangeMileage():"");
1839   - m.put("formal", b.getFormalMileage()!=null?b.getFormalMileage():"");
  1837 + m.put("budget", b.getBudgetMileage()!=null?df.format(b.getBudgetMileage()):"");
  1838 + m.put("change", b.getChangeMileage()!=null?df.format(b.getChangeMileage()):"");
  1839 + m.put("formal", b.getFormalMileage()!=null?df.format(b.getFormalMileage()):"");
1840 1840 for(int i = 1; i <= 12; i++){
1841 1841 m.put("mon"+i, "");
1842 1842 m.put("bud"+i, "");
... ... @@ -1844,7 +1844,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1844 1844 }
1845 1845 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1846 1846 if(b.getFormalMileage()!=null){
1847   - m.put(bud, b.getFormalMileage());
  1847 + m.put(bud, df.format(b.getFormalMileage()));
1848 1848 }
1849 1849 m.put("monAll", "0");
1850 1850 xlMap.put(key1, m);
... ... @@ -1854,28 +1854,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1854 1854 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1855 1855 if(b.getBudgetMileage()!=null){
1856 1856 if(m.get("budget").toString().length() > 0){
1857   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
1858   - new BigDecimal(b.getBudgetMileage())).doubleValue());
  1857 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  1858 + new BigDecimal(b.getBudgetMileage())).doubleValue()));
1859 1859 } else {
1860   - m.put("budget", b.getBudgetMileage());
  1860 + m.put("budget", df.format(b.getBudgetMileage()));
1861 1861 }
1862 1862 }
1863 1863 if(b.getChangeMileage()!=null){
1864 1864 if(m.get("change").toString().length() > 0){
1865   - m.put("change", new BigDecimal(m.get("change").toString()).add(
1866   - new BigDecimal(b.getChangeMileage())).doubleValue());
  1865 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  1866 + new BigDecimal(b.getChangeMileage())).doubleValue()));
1867 1867 } else {
1868   - m.put("change", b.getChangeMileage());
  1868 + m.put("change", df.format(b.getChangeMileage()));
1869 1869 }
1870 1870 }
1871 1871 if(b.getFormalMileage()!=null){
1872 1872 if(m.get("formal").toString().length() > 0){
1873   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
1874   - new BigDecimal(b.getFormalMileage())).doubleValue());
  1873 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  1874 + new BigDecimal(b.getFormalMileage())).doubleValue()));
1875 1875 } else {
1876   - m.put("formal", b.getFormalMileage());
  1876 + m.put("formal", df.format(b.getFormalMileage()));
1877 1877 }
1878   - m.put(bud, b.getFormalMileage());
  1878 + m.put(bud, df.format(b.getFormalMileage()));
1879 1879 }
1880 1880 }
1881 1881 }
... ... @@ -1888,9 +1888,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1888 1888 m.put("xlBm", xlBm);
1889 1889 m.put("xlName", xlName);
1890 1890 m.put("type", "人次");
1891   - m.put("budget", b.getBudgetPerson()!=null?b.getBudgetPerson():"");
1892   - m.put("change", b.getChangePerson()!=null?b.getChangePerson():"");
1893   - m.put("formal", b.getFormalPerson()!=null?b.getFormalPerson():"");
  1891 + m.put("budget", b.getBudgetPerson()!=null?df.format(b.getBudgetPerson()):"");
  1892 + m.put("change", b.getChangePerson()!=null?df.format(b.getChangePerson()):"");
  1893 + m.put("formal", b.getFormalPerson()!=null?df.format(b.getFormalPerson()):"");
1894 1894 for(int i = 1; i <= 12; i++){
1895 1895 m.put("mon"+i, "");
1896 1896 m.put("bud"+i, "");
... ... @@ -1898,7 +1898,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1898 1898 }
1899 1899 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1900 1900 if(b.getFormalPerson()!=null){
1901   - m.put(bud, b.getFormalPerson());
  1901 + m.put(bud, df.format(b.getFormalPerson()));
1902 1902 }
1903 1903 m.put("monAll", "0");
1904 1904 xlMap.put(key2, m);
... ... @@ -1908,28 +1908,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1908 1908 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1909 1909 if(b.getBudgetPerson()!=null){
1910 1910 if(m.get("budget").toString().length() > 0){
1911   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
1912   - new BigDecimal(b.getBudgetPerson())).doubleValue());
  1911 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  1912 + new BigDecimal(b.getBudgetPerson())).doubleValue()));
1913 1913 } else {
1914   - m.put("budget", b.getBudgetPerson());
  1914 + m.put("budget", df.format(b.getBudgetPerson()));
1915 1915 }
1916 1916 }
1917 1917 if(b.getChangePerson()!=null){
1918 1918 if(m.get("change").toString().length() > 0){
1919   - m.put("change", new BigDecimal(m.get("change").toString()).add(
1920   - new BigDecimal(b.getChangePerson())).doubleValue());
  1919 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  1920 + new BigDecimal(b.getChangePerson())).doubleValue()));
1921 1921 } else {
1922   - m.put("change", b.getChangePerson());
  1922 + m.put("change", df.format(b.getChangePerson()));
1923 1923 }
1924 1924 }
1925 1925 if(b.getFormalPerson()!=null){
1926 1926 if(m.get("formal").toString().length() > 0){
1927   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
1928   - new BigDecimal(b.getFormalPerson())).doubleValue());
  1927 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  1928 + new BigDecimal(b.getFormalPerson())).doubleValue()));
1929 1929 } else {
1930   - m.put("formal", b.getFormalPerson());
  1930 + m.put("formal", df.format(b.getFormalPerson()));
1931 1931 }
1932   - m.put(bud, b.getFormalPerson());
  1932 + m.put(bud, df.format(b.getFormalPerson()));
1933 1933 }
1934 1934 }
1935 1935 }
... ... @@ -1942,9 +1942,9 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1942 1942 m.put("xlBm", xlBm);
1943 1943 m.put("xlName", xlName);
1944 1944 m.put("type", "营收");
1945   - m.put("budget", b.getBudgetAmounts()!=null?b.getBudgetAmounts():"");
1946   - m.put("change", b.getChangeAmounts()!=null?b.getChangeAmounts():"");
1947   - m.put("formal", b.getFormalAmounts()!=null?b.getFormalAmounts():"");
  1945 + m.put("budget", b.getBudgetAmounts()!=null?df.format(b.getBudgetAmounts()):"");
  1946 + m.put("change", b.getChangeAmounts()!=null?df.format(b.getChangeAmounts()):"");
  1947 + m.put("formal", b.getFormalAmounts()!=null?df.format(b.getFormalAmounts()):"");
1948 1948 for(int i = 1; i <= 12; i++){
1949 1949 m.put("mon"+i, "");
1950 1950 m.put("bud"+i, "");
... ... @@ -1952,7 +1952,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1952 1952 }
1953 1953 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1954 1954 if(b.getFormalAmounts()!=null){
1955   - m.put(bud, b.getFormalAmounts());
  1955 + m.put(bud, df.format(b.getFormalAmounts()));
1956 1956 }
1957 1957 m.put("monAll", "0");
1958 1958 xlMap.put(key3, m);
... ... @@ -1962,28 +1962,28 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
1962 1962 String bud = "bud" + Integer.valueOf(b.getYear().split("-")[1]);
1963 1963 if(b.getBudgetAmounts()!=null){
1964 1964 if(m.get("budget").toString().length() > 0){
1965   - m.put("budget", new BigDecimal(m.get("budget").toString()).add(
1966   - new BigDecimal(b.getBudgetAmounts())).doubleValue());
  1965 + m.put("budget", df.format(new BigDecimal(m.get("budget").toString()).add(
  1966 + new BigDecimal(b.getBudgetAmounts())).doubleValue()));
1967 1967 } else {
1968   - m.put("budget", b.getBudgetAmounts());
  1968 + m.put("budget", df.format(b.getBudgetAmounts()));
1969 1969 }
1970 1970 }
1971 1971 if(b.getChangeAmounts()!=null){
1972 1972 if(m.get("change").toString().length() > 0){
1973   - m.put("change", new BigDecimal(m.get("change").toString()).add(
1974   - new BigDecimal(b.getChangeAmounts())).doubleValue());
  1973 + m.put("change", df.format(new BigDecimal(m.get("change").toString()).add(
  1974 + new BigDecimal(b.getChangeAmounts())).doubleValue()));
1975 1975 } else {
1976   - m.put("change", b.getChangeAmounts());
  1976 + m.put("change", df.format(b.getChangeAmounts()));
1977 1977 }
1978 1978 }
1979 1979 if(b.getFormalAmounts()!=null){
1980 1980 if(m.get("formal").toString().length() > 0){
1981   - m.put("formal", new BigDecimal(m.get("formal").toString()).add(
1982   - new BigDecimal(b.getFormalAmounts())).doubleValue());
  1981 + m.put("formal", df.format(new BigDecimal(m.get("formal").toString()).add(
  1982 + new BigDecimal(b.getFormalAmounts())).doubleValue()));
1983 1983 } else {
1984   - m.put("formal", b.getFormalAmounts());
  1984 + m.put("formal", df.format(b.getFormalAmounts()));
1985 1985 }
1986   - m.put(bud, b.getFormalAmounts());
  1986 + m.put(bud, df.format(b.getFormalAmounts()));
1987 1987 }
1988 1988 }
1989 1989 }
... ... @@ -2298,7 +2298,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
2298 2298 }
2299 2299 if(m.get(bud).toString().length() > 0){
2300 2300 if(map.get(bud).toString().length() > 0){
2301   - map.put(mon, new BigDecimal(m.get(bud).toString()).add(
  2301 + map.put(bud, new BigDecimal(m.get(bud).toString()).add(
2302 2302 new BigDecimal(map.get(bud).toString())).doubleValue());
2303 2303 } else {
2304 2304 map.put(bud, new BigDecimal(m.get(bud).toString()).doubleValue());
... ...