潘钊 / bsth_control · Commits

Commit 69bcccea6a8862c84bb0c90abf8390afb4f5d4ab

Authored by 娄高锋
1 parent 3fa7578a
build: skipped

青浦班次日报表没有正确计算损失公里问题修复。

Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
  View file @69bccce
@@ -3037,10 +3037,11 @@ public class FormsServiceImpl implements FormsService { @@ -3037,10 +3037,11 @@ public class FormsServiceImpl implements FormsService {
3037 }); 3037 });
3038 List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); 3038 List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
3039 List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); 3039 List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm");
3040 - List<ScheduleRealInfo> sList; 3040 +
3041 List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString()); 3041 List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString());
3042 for(int i=0;i<list.size();i++){ 3042 for(int i=0;i<list.size();i++){
3043 - sList =new ArrayList<ScheduleRealInfo>(); 3043 + List<ScheduleRealInfo> zList = new ArrayList<ScheduleRealInfo>();
  3044 + List<ScheduleRealInfo> sList = new ArrayList<ScheduleRealInfo>();
3044 Daily d=list.get(i); 3045 Daily d=list.get(i);
3045 Double yh=0.0; 3046 Double yh=0.0;
3046 for (int j = 0; j < listYlb.size(); j++) { 3047 for (int j = 0; j < listYlb.size(); j++) {
@@ -3060,6 +3061,9 @@ public class FormsServiceImpl implements FormsService { @@ -3060,6 +3061,9 @@ public class FormsServiceImpl implements FormsService {
3060 for (int j = 0; j < lists.size(); j++) { 3061 for (int j = 0; j < lists.size(); j++) {
3061 ScheduleRealInfo s=lists.get(j); 3062 ScheduleRealInfo s=lists.get(j);
3062 if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){ 3063 if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
  3064 +
  3065 + zList.add(s);
  3066 +
3063 Set<ChildTaskPlan> cts = s.getcTasks(); 3067 Set<ChildTaskPlan> cts = s.getcTasks();
3064 if(cts != null && cts.size() > 0){ 3068 if(cts != null && cts.size() > 0){
3065 sList.add(s); 3069 sList.add(s);
@@ -3082,7 +3086,7 @@ public class FormsServiceImpl implements FormsService { @@ -3082,7 +3086,7 @@ public class FormsServiceImpl implements FormsService {
3082 double zksgl=Arith.add(ksgl, jccgl); 3086 double zksgl=Arith.add(ksgl, jccgl);
3083 double ljgl=culateMileageService.culateLjgl(sList); 3087 double ljgl=culateMileageService.culateLjgl(sList);
3084 double sjgl=culateMileageService.culateSjgl(sList); 3088 double sjgl=culateMileageService.culateSjgl(sList);
3085 - double lbgl=culateMileageService.culateLbgl(sList); 3089 + double lbgl=culateMileageService.culateLbgl(zList);
3086 double zyygl=Arith.add(ljgl, sjgl); 3090 double zyygl=Arith.add(ljgl, sjgl);
3087 3091
3088 d.setJzl1(String.valueOf(zksgl));//空驶公里 3092 d.setJzl1(String.valueOf(zksgl));//空驶公里