Commit 3232b66a93fa4288cc6c011904660b861714d24c
1 parent
6acfb9ca
子任务临加空驶漏算非进出场空驶。
Showing
2 changed files
with
8 additions
and
7 deletions
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
| @@ -1137,10 +1137,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | @@ -1137,10 +1137,7 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | ||
| 1137 | if(childTaskPlan.getMileageType().equals("empty")){ | 1137 | if(childTaskPlan.getMileageType().equals("empty")){ |
| 1138 | if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){ | 1138 | if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){ |
| 1139 | ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage()); | 1139 | ljjcc =Arith.add(ljjcc, childTaskPlan.getMileage()); |
| 1140 | - } | ||
| 1141 | - } | ||
| 1142 | - if(childTaskPlan.getMileageType().equals("empty")){ | ||
| 1143 | - if(childTaskPlan.getType2().equals("1")){ | 1140 | + } else { |
| 1144 | ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage()); | 1141 | ljkfks =Arith.add(ljkfks, childTaskPlan.getMileage()); |
| 1145 | } | 1142 | } |
| 1146 | } | 1143 | } |
| @@ -1370,7 +1367,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | @@ -1370,7 +1367,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | ||
| 1370 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); | 1367 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); |
| 1371 | while (it.hasNext()) { | 1368 | while (it.hasNext()) { |
| 1372 | ChildTaskPlan childTaskPlan = it.next(); | 1369 | ChildTaskPlan childTaskPlan = it.next(); |
| 1373 | - if(childTaskPlan.getType2().equals("1") && childTaskPlan.getMileageType().equals("empty") | 1370 | + if(!childTaskPlan.getType2().equals("2") && !childTaskPlan.getType2().equals("3") // 子任务非进出场空驶，与culateZrwJccLc方法区分。 |
| 1371 | + && childTaskPlan.getMileageType().equals("empty") | ||
| 1374 | && !("临加".equals(childTaskPlan.getType1()))){ | 1372 | && !("临加".equals(childTaskPlan.getType1()))){ |
| 1375 | if (!childTaskPlan.isDestroy()) { | 1373 | if (!childTaskPlan.isDestroy()) { |
| 1376 | zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage()); | 1374 | zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage()); |
| @@ -1414,7 +1412,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | @@ -1414,7 +1412,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{ | ||
| 1414 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); | 1412 | Iterator<ChildTaskPlan> it = childTaskPlans.iterator(); |
| 1415 | while (it.hasNext()) { | 1413 | while (it.hasNext()) { |
| 1416 | ChildTaskPlan childTaskPlan = it.next(); | 1414 | ChildTaskPlan childTaskPlan = it.next(); |
| 1417 | - if(childTaskPlan.getType2().equals("1")&&childTaskPlan.getMileageType().equals("empty")){ | 1415 | + if(!childTaskPlan.getType2().equals("2") && !childTaskPlan.getType2().equals("3") |
| 1416 | + &&childTaskPlan.getMileageType().equals("empty")){ | ||
| 1418 | if (!childTaskPlan.isDestroy()) { | 1417 | if (!childTaskPlan.isDestroy()) { |
| 1419 | kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage()); | 1418 | kfks=Arith.add(kfks,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage()); |
| 1420 | } | 1419 | } |
src/main/resources/static/pages/forms/statement/statisticsDaily.html
| @@ -127,7 +127,9 @@ | @@ -127,7 +127,9 @@ | ||
| 127 | <td><span>路救抛锚</span></td> | 127 | <td><span>路救抛锚</span></td> |
| 128 | <td><span>其他</span></td> | 128 | <td><span>其他</span></td> |
| 129 | <td><span>营运</span></td> | 129 | <td><span>营运</span></td> |
| 130 | - <td><span>空驶</span></td> | 130 | + <td title="临加空驶公里：除临加进出场与空驶公里外，而外加上子任务中产生的空驶公里。"> |
| 131 | + <span>空驶</span> | ||
| 132 | + </td> | ||
| 131 | <td><span>全日</span></td> | 133 | <td><span>全日</span></td> |
| 132 | <td><span>早高峰</span></td> | 134 | <td><span>早高峰</span></td> |
| 133 | <td><span>晚高峰</span></td> | 135 | <td><span>晚高峰</span></td> |