潘钊 / control_service_data_Interface · Commits

Commit 1a7a7291a769f626308d9716aa228b3138cb85ed

Authored by 潘钊
1 parent 3d5ec8e3

update...

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
src/main/java/com/bsth/server_rs/schedule/real/ScheduleRealService.java
  View file @1a7a729
... ... @@ -130,9 +130,10 @@ public class ScheduleRealService {
130 130 for(ScheduleRealInfo sch : all){
131 131 if(sch.getBcType().equals("in") || sch.getBcType().equals("out") || sch.getBcType().equals("ldks"))
132 132 continue;
133   - if(sch.getStatus() != -1 && (sch.getcTasks()==null || sch.getcTasks().size()==0))
134   - continue;
135   - rs.add(sch);
  133 +
  134 + //烂班，临加，有子任务的
  135 + if(sch.getStatus()==-1 || sch.isSflj() || (sch.getcTasks()!=null && sch.getcTasks().size() > 0))
  136 + rs.add(sch);
136 137 }
137 138 return rs;
138 139 }
... ...
src/main/java/com/bsth/server_ws/util/ScheduleCalculator.java
  View file @1a7a729
... ... @@ -194,14 +194,14 @@ public class ScheduleCalculator {
194 194 double sum = 0;
195 195 Set<ChildTaskPlan> cts;
196 196 for (ScheduleRealInfo sch : list) {
197   - if (sch.isSflj() || isInOut(sch))
  197 + if (sch.isSflj() || isInOut(sch) || sch.getBcType().equals("ldks"))
198 198 continue;
199 199  
200 200 cts = sch.getcTasks();
201 201 //有子任务
202 202 if (cts != null && cts.size() > 0) {
203 203 for (ChildTaskPlan ct : cts) {
204   - if (ct.isDestroy())
  204 + if (ct.isDestroy() && ct.getMileageType().equals("service"))
205 205 sum = Arith.add(sum, ct.getMileage());
206 206 }
207 207 } else if (sch.getStatus() == -1) {
... ...