潘钊 / bsth_control · Commits

Commit e1018ca69e6c830d9fc1897c5f369ae2d83d07f8

Authored by 娄高锋
1 parent 588834e4
build: skipped

路单线路明细月报表、年报表，实际班次统计加上临加班次。

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @e1018ca
... ... @@ -2455,7 +2455,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
2455 2455 } else if("jhgl".equals(itemDetails)){
2456 2456 listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
2457 2457 } else if("sjbc".equals(itemDetails)){
2458   - listStr.add(c1.getSjyybc()+c1.getSjfyybc()+"");
  2458 + listStr.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
2459 2459 } else if("jhbc".equals(itemDetails)){
2460 2460 listStr.add(c1.getJhyybc()+c1.getJhfyybc()+"");
2461 2461 }
... ... @@ -2519,7 +2519,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl<CalcWaybill, Integer
2519 2519 } else if("jhgl".equals(itemDetails)){
2520 2520 listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
2521 2521 } else if("sjbc".equals(itemDetails)){
2522   - listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
  2522 + listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
2523 2523 } else if("jhbc".equals(itemDetails)){
2524 2524 listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
2525 2525 }
... ...