Commit f2bd39ce04a197bd4922c50ae1d268e12af55dc1
1 parent
69bcccea
青浦调度，行车路单子任务排序方式修改（外加结束时间排序），实际进出场公里计算问题；班次日报表路牌拆分公里。
Showing
3 changed files
with
27 additions
and
18 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| @@ -3035,8 +3035,9 @@ public class FormsServiceImpl implements FormsService { | @@ -3035,8 +3035,9 @@ public class FormsServiceImpl implements FormsService { | ||
| 3035 | return daily; | 3035 | return daily; |
| 3036 | } | 3036 | } |
| 3037 | }); | 3037 | }); |
| 3038 | - List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); | ||
| 3039 | - List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); | 3038 | + //青浦油电入库方式不一样 |
| 3039 | +// List<Ylb> listYlb= ylbRepository.obtainYl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); | ||
| 3040 | +// List<Dlb> listDlb= dlbRepository.obtainDl(map.get("date").toString(), "", "", xlbm, "", "xlbm"); | ||
| 3040 | 3041 | ||
| 3041 | List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString()); | 3042 | List<ScheduleRealInfo> lists=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(map.get("line").toString(), map.get("date").toString()); |
| 3042 | for(int i=0;i<list.size();i++){ | 3043 | for(int i=0;i<list.size();i++){ |
| @@ -3044,23 +3045,25 @@ public class FormsServiceImpl implements FormsService { | @@ -3044,23 +3045,25 @@ public class FormsServiceImpl implements FormsService { | ||
| 3044 | List<ScheduleRealInfo> sList = new ArrayList<ScheduleRealInfo>(); | 3045 | List<ScheduleRealInfo> sList = new ArrayList<ScheduleRealInfo>(); |
| 3045 | Daily d=list.get(i); | 3046 | Daily d=list.get(i); |
| 3046 | Double yh=0.0; | 3047 | Double yh=0.0; |
| 3047 | - for (int j = 0; j < listYlb.size(); j++) { | ||
| 3048 | - Ylb y=listYlb.get(j); | ||
| 3049 | - if(y.getNbbm().equals(d.getZbh())&& y.getJsy().equals(d.getJgh())){ | ||
| 3050 | - yh=Arith.add(yh, y.getYh()); | ||
| 3051 | - } | ||
| 3052 | - } | ||
| 3053 | - | ||
| 3054 | - for (int j = 0; j < listDlb.size(); j++) { | ||
| 3055 | - Dlb b=listDlb.get(j); | ||
| 3056 | - if(b.getNbbm().equals(d.getZbh())&& b.getJsy().equals(d.getJgh())){ | ||
| 3057 | - yh=Arith.add(yh, b.getHd()); | ||
| 3058 | - } | ||
| 3059 | - } | 3048 | + //青浦油电入库方式不一样 |
| 3049 | +// for (int j = 0; j < listYlb.size(); j++) { | ||
| 3050 | +// Ylb y=listYlb.get(j); | ||
| 3051 | +// if(y.getNbbm().equals(d.getZbh())&& y.getJsy().equals(d.getJgh())){ | ||
| 3052 | +// yh=Arith.add(yh, y.getYh()); | ||
| 3053 | +// } | ||
| 3054 | +// } | ||
| 3055 | +// | ||
| 3056 | +// for (int j = 0; j < listDlb.size(); j++) { | ||
| 3057 | +// Dlb b=listDlb.get(j); | ||
| 3058 | +// if(b.getNbbm().equals(d.getZbh())&& b.getJsy().equals(d.getJgh())){ | ||
| 3059 | +// yh=Arith.add(yh, b.getHd()); | ||
| 3060 | +// } | ||
| 3061 | +// } | ||
| 3060 | d.setYh(Arith.round(yh, 3) + ""); | 3062 | d.setYh(Arith.round(yh, 3) + ""); |
| 3061 | for (int j = 0; j < lists.size(); j++) { | 3063 | for (int j = 0; j < lists.size(); j++) { |
| 3062 | ScheduleRealInfo s=lists.get(j); | 3064 | ScheduleRealInfo s=lists.get(j); |
| 3063 | - if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){ | 3065 | + if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh()) |
| 3066 | + && d.getLp().equals(s.getLpName())){ | ||
| 3064 | 3067 | ||
| 3065 | zList.add(s); | 3068 | zList.add(s); |
| 3066 | 3069 |
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -4495,7 +4495,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -4495,7 +4495,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 4495 | double addMileage = 0, remMileage = 0, sjssgl = 0; | 4495 | double addMileage = 0, remMileage = 0, sjssgl = 0; |
| 4496 | Map<String, Object> map = new HashMap<String, Object>(); | 4496 | Map<String, Object> map = new HashMap<String, Object>(); |
| 4497 | jhlc = culateMieageService.culateJhgl(lists); | 4497 | jhlc = culateMieageService.culateJhgl(lists); |
| 4498 | - jcclc = culateMieageService.culateJccgl(lists); | 4498 | + jcclc = culateMieageService.culateJccgl(lists_sj); |
| 4499 | jhzks = culateMieageService.culateJhJccgl(lists); | 4499 | jhzks = culateMieageService.culateJhJccgl(lists); |
| 4500 | jhjcclc = culateMieageService.culateJhJccgl_real(lists); | 4500 | jhjcclc = culateMieageService.culateJhJccgl_real(lists); |
| 4501 | remMileage = culateMieageService.culateLbgl(lists); | 4501 | remMileage = culateMieageService.culateLbgl(lists); |
src/main/java/com/bsth/util/ComparableChild.java
| @@ -10,7 +10,13 @@ public class ComparableChild implements Comparator<ChildTaskPlan>{ | @@ -10,7 +10,13 @@ public class ComparableChild implements Comparator<ChildTaskPlan>{ | ||
| 10 | @Override | 10 | @Override |
| 11 | public int compare(ChildTaskPlan o1, ChildTaskPlan o2) { | 11 | public int compare(ChildTaskPlan o1, ChildTaskPlan o2) { |
| 12 | // TODO Auto-generated method stub | 12 | // TODO Auto-generated method stub |
| 13 | - return o1.getStartDate().compareTo(o2.getStartDate()); | 13 | + //子任务按开始时间、结束时间排序 |
| 14 | + int a = o1.getStartDate().compareTo(o2.getStartDate()); | ||
| 15 | + if(a == 0){ | ||
| 16 | + return o1.getEndDate().compareTo(o2.getEndDate()); | ||
| 17 | + } else { | ||
| 18 | + return a; | ||
| 19 | + } | ||
| 14 | } | 20 | } |
| 15 | 21 | ||
| 16 | } | 22 | } |