潘钊 / bsth_control · Commits

Commit 7a2ad201bc5ebddc47daba836b32175e41ead071

Authored by 娄高锋
1 parent 235080b4
build: skipped

路单线路年报、月报表，异常处理

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @7a2ad20
... ... @@ -2012,6 +2012,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
2012 2012 // List类转换
2013 2013 final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
2014 2014  
  2015 + if(flag == 4)
2015 2016 try {
2016 2017 List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(line, dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy);
2017 2018 List<Dlb> dlbNotSchedule = calcRepository.DlbNotSchedule(line, dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy);
... ... @@ -2047,7 +2048,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2047 2048 cNew.setCl(y.getNbbm());
2048 2049 cNew.setjGh(y.getJsy());
2049 2050 cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
2050   - listNew.add(l+1, cNew);
  2051 + listNew.add(l, cNew);
2051 2052 } else {
2052 2053 CalcWaybillDetail cNew = new CalcWaybillDetail();
2053 2054 cNew.setRq(ylbrq);
... ... @@ -2096,7 +2097,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2096 2097 cNew.setCl(d.getNbbm());
2097 2098 cNew.setjGh(d.getJsy());
2098 2099 cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
2099   - listNew.add(l+1, cNew);
  2100 + listNew.add(l, cNew);
2100 2101 } else {
2101 2102 CalcWaybillDetail cNew = new CalcWaybillDetail();
2102 2103 cNew.setRq(dlbrq);
... ...