Commit 83c27b511a79e6730826cb8ce43d28014d3a1d8f
1 parent
db61e544
临港需求:烂班班次其子任务若存在营运里程则作为实驶班次
Showing
1 changed file
with
16 additions
and
2 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
| @@ -3981,8 +3981,22 @@ public class BigscreenService { | @@ -3981,8 +3981,22 @@ public class BigscreenService { | ||
| 3981 | if (!BigscreenService.isInOut(s) && s.isSflj()){ | 3981 | if (!BigscreenService.isInOut(s) && s.isSflj()){ |
| 3982 | ++ljbc; | 3982 | ++ljbc; |
| 3983 | } | 3983 | } |
| 3984 | - if (!BigscreenService.isInOut(s) && !s.isCcService() && s.getStatus() == -1) { | ||
| 3985 | - ++lbbc; | 3984 | + if (!BigscreenService.isInOut(s) && !s.isCcService() && s.getStatus() == -1) { //(20231031)烂班班次,子任务如果有营运里程,视为实际班次。 |
| 3985 | + boolean b = true; | ||
| 3986 | + for(ChildTaskPlan c : cts){ | ||
| 3987 | + if("service".equals(c.getMileageType()) && !c.isDestroy()){ | ||
| 3988 | + BigDecimal mileage = new BigDecimal(c.getMileage()); | ||
| 3989 | + if(mileage.compareTo(BigDecimal.ZERO) == 1){ //大于0 | ||
| 3990 | + b = false; | ||
| 3991 | + } | ||
| 3992 | + } | ||
| 3993 | + if(b == false){ | ||
| 3994 | + break; | ||
| 3995 | + } | ||
| 3996 | + } | ||
| 3997 | + if(b){ | ||
| 3998 | + ++lbbc; | ||
| 3999 | + } | ||
| 3986 | } | 4000 | } |
| 3987 | } else { | 4001 | } else { |
| 3988 | boolean fage = true; | 4002 | boolean fage = true; |