潘钊 / bsth_control · Commits

Commit f6d54f73dc406b1895edc950e9f66315cdf8d7f8

Authored by youxiw2000
2 parents 5d83333c f8106f0b
build: skipped

Merge branch 'pudong_jdk8' of 192.168.168.201:panzhaov5/bsth_control into pudong_jdk8

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
src/main/java/com/bsth/XDApplication.java
  View file @f6d54f7
... ... @@ -97,8 +97,8 @@ public class XDApplication implements CommandLineRunner {
97 97 timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
98 98 if (timeDiff < 0)
99 99 timeDiff += (1000 * 60 * 60 * 24);
100   - // 早上07:00
101   - timeDiffTraffic = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 7) - System.currentTimeMillis();
  100 + // 早上09:00
  101 + timeDiffTraffic = (DateUtils.getTimestamp() + 3600000 * 9) - System.currentTimeMillis();
102 102 if (timeDiffTraffic < 0)
103 103 timeDiffTraffic += (1000 * 60 * 60 * 24);
104 104 }
... ...
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
  View file @f6d54f7
... ... @@ -2396,7 +2396,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2396 2396 } else if("jhgl".equals(itemDetails)){
2397 2397 listStr.add(df.format(c1.getJhyylc()+c1.getJhfyylc()));
2398 2398 } else if("sjbc".equals(itemDetails)){
2399   - listStr.add(c1.getSjyybc()+c1.getSjfyybc()+"");
  2399 + listStr.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
2400 2400 } else if("jhbc".equals(itemDetails)){
2401 2401 listStr.add(c1.getJhyybc()+c1.getJhfyybc()+"");
2402 2402 }
... ... @@ -2451,7 +2451,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
2451 2451 } else if("jhgl".equals(itemDetails)){
2452 2452 listEnd.add((df.format(c1.getJhyylc()+c1.getJhfyylc())));
2453 2453 } else if("sjbc".equals(itemDetails)){
2454   - listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+"");
  2454 + listEnd.add(c1.getSjyybc()+c1.getSjfyybc()+c1.getLjbc()+"");
2455 2455 } else if("jhbc".equals(itemDetails)){
2456 2456 listEnd.add((c1.getJhyybc()+c1.getJhfyybc())+"");
2457 2457 }
... ...