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

娄高锋
1 parent 235080b4
Showing 1 changed file with 3 additions and 2 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
@@ -2012,6 +2012,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		// List类转换
 		final List<CalcWaybillDetail> listNew = JSONArray.parseArray(JSON.toJSONString(list), CalcWaybillDetail.class);
+		if(flag == 4)
 		try {
 			List<Ylb> ylbNotSchedule = calcRepository.ylbNotSchedule(line, dateFormat.parse(startDate), dateFormat.parse(endDate), gsdm, fgsdm, destroy);
 			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
 					cNew.setCl(y.getNbbm());
 					cNew.setjGh(y.getJsy());
 					cNew.setjName(BasicData.allPerson.get(y.getSsgsdm()+"-"+y.getJsy()));
-					listNew.add(l+1, cNew);
+					listNew.add(l, cNew);
 				} else {
 					CalcWaybillDetail cNew = new CalcWaybillDetail();
 					cNew.setRq(ylbrq);
@@ -2096,7 +2097,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					cNew.setCl(d.getNbbm());
 					cNew.setjGh(d.getJsy());
 					cNew.setjName(BasicData.allPerson.get(d.getSsgsdm()+"-"+d.getJsy()));
-					listNew.add(l+1, cNew);
+					listNew.add(l, cNew);
 				} else {
 					CalcWaybillDetail cNew = new CalcWaybillDetail();
 					cNew.setRq(dlbrq);