潘钊 / bsth_control · Commits

Commit f50a41c67a6e2e1398fa5ab44fc79e58d2031d7b

Authored by 娄高锋
1 parent f76872cc

LGF 报表

Inline Side-by-side
Showing 1 changed file with 17 additions and 14 deletions
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
  View file @f50a41c
... ... @@ -26,6 +26,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
26 26 import com.bsth.entity.schedule.TTInfoDetail;
27 27 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
28 28 import com.bsth.util.ReportUtils;
  29 +import com.ibm.wsdl.util.xml.DOM2Writer;
29 30  
30 31 @Service
31 32 public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
... ... @@ -416,22 +417,24 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
416 417  
417 418 //分组计算 同时判断是否所选时刻信息
418 419 for(ScheduleRealInfo schedule : list){
419   - if(model.length() != 0){
420   - for(TTInfoDetail tt : ttList){
421   - if(tt.getBcs() == schedule.getBcs() && tt.getFcsj().equals(schedule.getFcsj())
422   - && tt.getBcsj() == schedule.getBcsj()){
423   - String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
424   - if(!keyMap.containsKey(key))
425   - keyMap.put(key, new ArrayList<ScheduleRealInfo>());
426   - keyMap.get(key).add(schedule);
427   - continue;
  420 + DO:{
  421 + if(model.length() != 0){
  422 + for(TTInfoDetail tt : ttList){
  423 + if(tt.getBcs() == schedule.getBcs() && tt.getFcsj().equals(schedule.getFcsj())
  424 + && tt.getBcsj() == schedule.getBcsj()){
  425 + String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
  426 + if(!keyMap.containsKey(key))
  427 + keyMap.put(key, new ArrayList<ScheduleRealInfo>());
  428 + keyMap.get(key).add(schedule);
  429 + break DO;
  430 + }
428 431 }
  432 + } else {
  433 + String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
  434 + if(!keyMap.containsKey(key))
  435 + keyMap.put(key, new ArrayList<ScheduleRealInfo>());
  436 + keyMap.get(key).add(schedule);
429 437 }
430   - } else {
431   - String key = schedule.getXlName()+"/"+schedule.getQdzName()+"/"+schedule.getFcsj();
432   - if(!keyMap.containsKey(key))
433   - keyMap.put(key, new ArrayList<ScheduleRealInfo>());
434   - keyMap.get(key).add(schedule);
435 438 }
436 439 }
437 440 for(String key : keyMap.keySet()){
... ...