潘钊 / bsth_control · Commits

Commit 6f6e2a67d933b59e263c56243d1e58c4f725992c

Authored by 廖磊
2 parents 51198032 8c109cbd
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control 

into pudong
Inline Side-by-side
Showing 3 changed files with 77 additions and 21 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @6f6e2a6
... ... @@ -2762,13 +2762,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2762 2762 !zdsj.equals(zdsjActual) &&
2763 2763 !zdsj.equals("")&&
2764 2764 !zdsjActual.equals("")) {
2765   - if (zdsj.compareTo(zdsjActual) > 0) {
2766   - maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
2767   - maps.put("slow", "");
2768   - } else {
2769   - maps.put("fast", "");
2770   - maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
2771   - }
  2765 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  2766 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
  2767 + if (zdsj.compareTo(zdsjActual) > 0) {
  2768 + if(zdsjT - zdsjAT > 1000){
  2769 + maps.put("fast", "");
  2770 + maps.put("slow", zdsjAT - zdsjT + 1440);
  2771 + } else {
  2772 + maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  2773 + maps.put("slow", "");
  2774 + }
  2775 + } else {
  2776 + if(zdsjAT - zdsjT > 1000){
  2777 + maps.put("fast", zdsjT - zdsjAT + 1440);
  2778 + maps.put("slow", "");
  2779 + } else {
  2780 + maps.put("fast", "");
  2781 + maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  2782 + }
  2783 + }
2772 2784 } else {
2773 2785 maps.put("fast", "");
2774 2786 maps.put("slow", "");
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @6f6e2a6
... ... @@ -1027,12 +1027,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1027 1027 !zdsj.equals(zdsjActual) &&
1028 1028 !zdsj.equals("")&&
1029 1029 !zdsjActual.equals("")) {
  1030 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  1031 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
1030 1032 if (zdsj.compareTo(zdsjActual) > 0) {
1031   - maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
1032   - maps.put("slow", "");
  1033 + if(zdsjT - zdsjAT > 1000){
  1034 + maps.put("fast", "");
  1035 + maps.put("slow", zdsjAT - zdsjT + 1440);
  1036 + } else {
  1037 + maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  1038 + maps.put("slow", "");
  1039 + }
1033 1040 } else {
1034   - maps.put("fast", "");
1035   - maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  1041 + if(zdsjAT - zdsjT > 1000){
  1042 + maps.put("fast", zdsjT - zdsjAT + 1440);
  1043 + maps.put("slow", "");
  1044 + } else {
  1045 + maps.put("fast", "");
  1046 + maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  1047 + }
1036 1048 }
1037 1049 } else {
1038 1050 maps.put("fast", "");
... ... @@ -3707,12 +3719,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3707 3719 String zdsjActual = scheduleRealInfo.getZdsjActual();
3708 3720 if (zdsj != null && zdsjActual != null &&
3709 3721 !zdsj.equals(zdsjActual)) {
  3722 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  3723 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
3710 3724 if (zdsj.compareTo(zdsjActual) > 0) {
3711   - map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
3712   - map.put("slow", "");
  3725 + if(zdsjT - zdsjAT > 1000){
  3726 + map.put("fast", "");
  3727 + map.put("slow", zdsjAT - zdsjT + 1440);
  3728 + } else {
  3729 + map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  3730 + map.put("slow", "");
  3731 + }
3713 3732 } else {
3714   - map.put("fast", "");
3715   - map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  3733 + if(zdsjAT - zdsjT > 1000){
  3734 + map.put("fast", zdsjT - zdsjAT + 1440);
  3735 + map.put("slow", "");
  3736 + } else {
  3737 + map.put("fast", "");
  3738 + map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  3739 + }
3716 3740 }
3717 3741 } else {
3718 3742 map.put("fast", "");
... ... @@ -4703,12 +4727,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
4703 4727 !zdsj.equals(zdsjActual) &&
4704 4728 !zdsj.equals("")&&
4705 4729 !zdsjActual.equals("")) {
  4730 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  4731 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
4706 4732 if (zdsj.compareTo(zdsjActual) > 0) {
4707   - maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
4708   - maps.put("slow", "");
  4733 + if(zdsjT - zdsjAT > 1000){
  4734 + maps.put("fast", "");
  4735 + maps.put("slow", zdsjAT - zdsjT + 1440);
  4736 + } else {
  4737 + maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  4738 + maps.put("slow", "");
  4739 + }
4709 4740 } else {
4710   - maps.put("fast", "");
4711   - maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  4741 + if(zdsjAT - zdsjT > 1000){
  4742 + maps.put("fast", zdsjT - zdsjAT + 1440);
  4743 + maps.put("slow", "");
  4744 + } else {
  4745 + maps.put("fast", "");
  4746 + maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  4747 + }
4712 4748 }
4713 4749 } else {
4714 4750 maps.put("fast", "");
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @6f6e2a6
... ... @@ -375,10 +375,18 @@
375 375 var zdsjActual = (obj.zdsjActual).split(":");
376 376 var zdsj = (obj.zdsj).split(":");
377 377 if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){
378   - obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  378 + if(zdsjActual[0]*60+Number(zdsjActual[1]) - zdsj[0]*60+Number(zdsj[1]) > 1000){
  379 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) + 1440;
  380 + } else {
  381 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1]));
  382 + }
379 383 }
380 384 else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){
381   - obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  385 + if((zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1])) > 1000){
  386 + obj["slow"] = (zdsjActual[0]*60+Number(zdsjActual[1])) - (zdsj[0]*60+Number(zdsj[1])) + 1440;
  387 + } else {
  388 + obj["fast"] = (zdsj[0]*60+Number(zdsj[1])) - (zdsjActual[0]*60+Number(zdsjActual[1]));
  389 + }
382 390 }
383 391 }
384 392 });
... ...