Commit f8106f0bf2c388c892c3c8457a259c986810c921
1 parent
3230a2c7
路单线路明细月报表、年报表，实际班次统计加上临加班次。
Showing
1 changed file
with
2 additions
and
2 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
| @@ -2396,7 +2396,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -2396,7 +2396,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 2396 | } else if("jhgl".equals(itemDetails)){ | 2396 | } else if("jhgl".equals(itemDetails)){ |
| 2397 | listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc())); | 2397 | listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc())); |
| 2398 | } else if("sjbc".equals(itemDetails)){ | 2398 | } else if("sjbc".equals(itemDetails)){ |
| 2399 | - listStr.add(c1.getSjyybc()+c1.getSjfyybc()+""); | 2399 | + listStr.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+""); |
| 2400 | } else if("jhbc".equals(itemDetails)){ | 2400 | } else if("jhbc".equals(itemDetails)){ |
| 2401 | listStr.add(c1.getJhyybc()+c1.getJhfyybc()+""); | 2401 | listStr.add(c1.getJhyybc()+c1.getJhfyybc()+""); |
| 2402 | } | 2402 | } |
| @@ -2451,7 +2451,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | @@ -2451,7 +2451,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer | ||
| 2451 | } else if("jhgl".equals(itemDetails)){ | 2451 | } else if("jhgl".equals(itemDetails)){ |
| 2452 | listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc()))); | 2452 | listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc()))); |
| 2453 | } else if("sjbc".equals(itemDetails)){ | 2453 | } else if("sjbc".equals(itemDetails)){ |
| 2454 | - listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+""); | 2454 | + listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+""); |
| 2455 | } else if("jhbc".equals(itemDetails)){ | 2455 | } else if("jhbc".equals(itemDetails)){ |
| 2456 | listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+""); | 2456 | listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+""); |
| 2457 | } | 2457 | } |