潘钊 / control_service_data_Interface · Commits

Commit 3fd5b8313ef26d1b3521e48be7434f16afa0321e

Authored by 潘钊
1 parent f08331e4

update...

Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
  View file @3fd5b83
@@ -21,7 +21,7 @@ public class ScheduleCalculator { @@ -21,7 +21,7 @@ public class ScheduleCalculator {
21 21
22 22
23 /** 23 /**
24 - * 计划公里（不包括进出场公里，临加公里） 24 + * 计划公里（不包括临加公里）
25 * 25 *
26 * @param list 26 * @param list
27 * @return 27 * @return
@@ -29,7 +29,7 @@ public class ScheduleCalculator { @@ -29,7 +29,7 @@ public class ScheduleCalculator {
29 public static double calcJHLC(List<ScheduleRealInfo> list) { 29 public static double calcJHLC(List<ScheduleRealInfo> list) {
30 double sum = 0; 30 double sum = 0;
31 for (ScheduleRealInfo sch : list) { 31 for (ScheduleRealInfo sch : list) {
32 - if (isInOut(sch) || sch.isSflj()) 32 + if (sch.isSflj())
33 continue; 33 continue;
34 sum = Arith.add(sum, sch.getJhlcOrig()); 34 sum = Arith.add(sum, sch.getJhlcOrig());
35 } 35 }
@@ -86,7 +86,7 @@ public class ScheduleCalculator { @@ -86,7 +86,7 @@ public class ScheduleCalculator {
86 } 86 }
87 87
88 /** 88 /**
89 - * 实际计划公里，包括临加，不包括进出场，不包括烂班 89 + * 实际计划公里，包括临加，不包括烂班
90 * 90 *
91 * @param list 91 * @param list
92 * @return 92 * @return
@@ -94,7 +94,7 @@ public class ScheduleCalculator { @@ -94,7 +94,7 @@ public class ScheduleCalculator {
94 public static double calcSJLC(List<ScheduleRealInfo> list) { 94 public static double calcSJLC(List<ScheduleRealInfo> list) {
95 double sum = 0; 95 double sum = 0;
96 for (ScheduleRealInfo sch : list) { 96 for (ScheduleRealInfo sch : list) {
97 - if (isInOut(sch) || sch.getStatus() == -1) 97 + if (sch.getStatus() == -1)
98 continue; 98 continue;
99 sum = Arith.add(sum, sch.getJhlcOrig()); 99 sum = Arith.add(sum, sch.getJhlcOrig());
100 } 100 }