潘钊 / bsth_control · Commits

Commit bce4952d484d6753f38bfcb0aa2593cb4326aba2

Authored by 廖磊
1 parent 59d320de
build: skipped

路单数据里程

Inline Side-by-side
Showing 1 changed file with 13 additions and 4 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @bce4952
... ... @@ -734,19 +734,28 @@ public class FormsServiceImpl implements FormsService {
734 734 String line=y.getXlbm();
735 735 String clzbh=y.getNbbm();
736 736 List<ScheduleRealInfo> newList=new ArrayList<ScheduleRealInfo>();
  737 + List<ScheduleRealInfo> newList_=new ArrayList<ScheduleRealInfo>();
737 738 for (int j = 0; j < listReal.size(); j++) {
738 739 ScheduleRealInfo s=listReal.get(j);
739 740 if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)
740 741 &&s.getXlBm().equals(line)){
741 742 newList.add(s);
  743 + Set<ChildTaskPlan> cts = s.getcTasks();
  744 + if(cts != null && cts.size() > 0){
  745 + newList_.add(s);
  746 + }else{
  747 + if(s.getZdsjActual()!=null){
  748 + newList_.add(s);
  749 + }
  750 + }
742 751 }
743 752 }
744 753 double jhgl=culateMileageService.culateJhgl(newList);
745 754 double jhjcc=culateMileageService.culateJhJccgl(newList);
746   - double yygl=culateMileageService.culateSjgl(newList);
747   - double ljgl=culateMileageService.culateLjgl(newList);
748   - double ksgl=culateMileageService.culateKsgl(newList);
749   - double jcgl=culateMileageService.culateJccgl(newList);
  755 + double yygl=culateMileageService.culateSjgl(newList_);
  756 + double ljgl=culateMileageService.culateLjgl(newList_);
  757 + double ksgl=culateMileageService.culateKsgl(newList_);
  758 + double jcgl=culateMileageService.culateJccgl(newList_);
750 759  
751 760 double zyygl=Arith.add(yygl, ljgl);
752 761 double zksgl=Arith.add(ksgl, jcgl);
... ...