Commit ee1f42dcf70d865d7389b2ea71aae208d410d4c7

Authored by 娄高锋
1 parent d003db3f

排班为临加班次,子任务为正常班次时,子任务的里程以排班为准算作临加里程

src/main/java/com/bsth/service/calc/impl/CalcCulateMileageServiceImpl.java
@@ -500,7 +500,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -500,7 +500,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
500 while (it.hasNext()) { 500 while (it.hasNext()) {
501 ChildTaskPlan childTaskPlan = it.next(); 501 ChildTaskPlan childTaskPlan = it.next();
502 if ("empty".equals(childTaskPlan.getMileageType()) 502 if ("empty".equals(childTaskPlan.getMileageType())
503 - && "临加".equals(childTaskPlan.getType1()) 503 + && ("临加".equals(childTaskPlan.getType1()) || scheduleRealInfo.isSflj())
504 && childTaskPlan.getCcId() == null 504 && childTaskPlan.getCcId() == null
505 && (!childTaskPlan.isNoClerk())) { 505 && (!childTaskPlan.isNoClerk())) {
506 if (!childTaskPlan.isDestroy()) { 506 if (!childTaskPlan.isDestroy()) {
@@ -508,6 +508,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{ @@ -508,6 +508,7 @@ public class CalcCulateMileageServiceImpl implements CalcCulateMileageService{
508 ljgl = Arith.add(ljgl, jhgl); 508 ljgl = Arith.add(ljgl, jhgl);
509 } 509 }
510 } 510 }
  511 +
511 } 512 }
512 } 513 }
513 } 514 }