update...

潘钊
1 parent 3d5ec8e3
Showing 2 changed files with 6 additions and 5 deletions
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
@@ -130,9 +130,10 @@ public class ScheduleRealService {
         for(ScheduleRealInfo sch : all){
             if(sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
                 continue;
-            if(sch.getStatus() != -1 && (sch.getcTasks()==null || sch.getcTasks().size()==0))
-                continue;
-            rs.add(sch);
+
+            //烂班，临加，有子任务的
+            if(sch.getStatus()==-1 || sch.isSflj() || (sch.getcTasks()!=null && sch.getcTasks().size() > 0))
+                rs.add(sch);
         }
         return rs;
     }
@@ -194,14 +194,14 @@ public class ScheduleCalculator {
         double sum = 0;
         Set<ChildTaskPlan> cts;
         for (ScheduleRealInfo sch : list) {
-            if (sch.isSflj() || isInOut(sch))
+            if (sch.isSflj() || isInOut(sch) || sch.getBcType().equals("ldks"))
                 continue;
             cts = sch.getcTasks();
             //有子任务
             if (cts != null && cts.size() > 0) {
                 for (ChildTaskPlan ct : cts) {
-                    if (ct.isDestroy())
+                    if (ct.isDestroy() && ct.getMileageType().equals("service"))
                         sum = Arith.add(sum, ct.getMileage());
                 }
             } else if (sch.getStatus() == -1) {