潘钊 / bsth_control · Commits

Commit df306bdfbcb68d11daaa7c7f2a20d4843e529347

Authored by 潘钊
2 parents db54a912 8c109cbd

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 @df306bd
@@ -2762,13 +2762,25 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -2762,13 +2762,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2762 !zdsj.equals(zdsjActual) && 2762 !zdsj.equals(zdsjActual) &&
2763 !zdsj.equals("")&& 2763 !zdsj.equals("")&&
2764 !zdsjActual.equals("")) { 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 } else { 2784 } else {
2773 maps.put("fast", ""); 2785 maps.put("fast", "");
2774 maps.put("slow", ""); 2786 maps.put("slow", "");
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @df306bd
@@ -1020,12 +1020,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -1020,12 +1020,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
1020 !zdsj.equals(zdsjActual) && 1020 !zdsj.equals(zdsjActual) &&
1021 !zdsj.equals("")&& 1021 !zdsj.equals("")&&
1022 !zdsjActual.equals("")) { 1022 !zdsjActual.equals("")) {
  1023 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  1024 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
1023 if (zdsj.compareTo(zdsjActual) > 0) { 1025 if (zdsj.compareTo(zdsjActual) > 0) {
1024 - maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));  
1025 - maps.put("slow", ""); 1026 + if(zdsjT - zdsjAT > 1000){
  1027 + maps.put("fast", "");
  1028 + maps.put("slow", zdsjAT - zdsjT + 1440);
  1029 + } else {
  1030 + maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  1031 + maps.put("slow", "");
  1032 + }
1026 } else { 1033 } else {
1027 - maps.put("fast", "");  
1028 - maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual)); 1034 + if(zdsjAT - zdsjT > 1000){
  1035 + maps.put("fast", zdsjT - zdsjAT + 1440);
  1036 + maps.put("slow", "");
  1037 + } else {
  1038 + maps.put("fast", "");
  1039 + maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  1040 + }
1029 } 1041 }
1030 } else { 1042 } else {
1031 maps.put("fast", ""); 1043 maps.put("fast", "");
@@ -3700,12 +3712,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -3700,12 +3712,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
3700 String zdsjActual = scheduleRealInfo.getZdsjActual(); 3712 String zdsjActual = scheduleRealInfo.getZdsjActual();
3701 if (zdsj != null && zdsjActual != null && 3713 if (zdsj != null && zdsjActual != null &&
3702 !zdsj.equals(zdsjActual)) { 3714 !zdsj.equals(zdsjActual)) {
  3715 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  3716 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
3703 if (zdsj.compareTo(zdsjActual) > 0) { 3717 if (zdsj.compareTo(zdsjActual) > 0) {
3704 - map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));  
3705 - map.put("slow", ""); 3718 + if(zdsjT - zdsjAT > 1000){
  3719 + map.put("fast", "");
  3720 + map.put("slow", zdsjAT - zdsjT + 1440);
  3721 + } else {
  3722 + map.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  3723 + map.put("slow", "");
  3724 + }
3706 } else { 3725 } else {
3707 - map.put("fast", "");  
3708 - map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual)); 3726 + if(zdsjAT - zdsjT > 1000){
  3727 + map.put("fast", zdsjT - zdsjAT + 1440);
  3728 + map.put("slow", "");
  3729 + } else {
  3730 + map.put("fast", "");
  3731 + map.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  3732 + }
3709 } 3733 }
3710 } else { 3734 } else {
3711 map.put("fast", ""); 3735 map.put("fast", "");
@@ -4696,12 +4720,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf @@ -4696,12 +4720,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
4696 !zdsj.equals(zdsjActual) && 4720 !zdsj.equals(zdsjActual) &&
4697 !zdsj.equals("")&& 4721 !zdsj.equals("")&&
4698 !zdsjActual.equals("")) { 4722 !zdsjActual.equals("")) {
  4723 + int zdsjT = Integer.valueOf(zdsj.split(":")[0])*60 + Integer.valueOf(zdsj.split(":")[1]);
  4724 + int zdsjAT = Integer.valueOf(zdsjActual.split(":")[0])*60 + Integer.valueOf(zdsjActual.split(":")[1]);
4699 if (zdsj.compareTo(zdsjActual) > 0) { 4725 if (zdsj.compareTo(zdsjActual) > 0) {
4700 - maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));  
4701 - maps.put("slow", ""); 4726 + if(zdsjT - zdsjAT > 1000){
  4727 + maps.put("fast", "");
  4728 + maps.put("slow", zdsjAT - zdsjT + 1440);
  4729 + } else {
  4730 + maps.put("fast", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  4731 + maps.put("slow", "");
  4732 + }
4702 } else { 4733 } else {
4703 - maps.put("fast", "");  
4704 - maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual)); 4734 + if(zdsjAT - zdsjT > 1000){
  4735 + maps.put("fast", zdsjT - zdsjAT + 1440);
  4736 + maps.put("slow", "");
  4737 + } else {
  4738 + maps.put("fast", "");
  4739 + maps.put("slow", TimeUtils.getTimeDifference(zdsj, zdsjActual));
  4740 + }
4705 } 4741 }
4706 } else { 4742 } else {
4707 maps.put("fast", ""); 4743 maps.put("fast", "");
src/main/resources/static/pages/forms/statement/waybill.html
  View file @df306bd
@@ -375,10 +375,18 @@ @@ -375,10 +375,18 @@
375 var zdsjActual = (obj.zdsjActual).split(":"); 375 var zdsjActual = (obj.zdsjActual).split(":");
376 var zdsj = (obj.zdsj).split(":"); 376 var zdsj = (obj.zdsj).split(":");
377 if(zdsjActual[0]*60+Number(zdsjActual[1]) > zdsj[0]*60+Number(zdsj[1])){ 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 else if(zdsjActual[0]*60+Number(zdsjActual[1]) < zdsj[0]*60+Number(zdsj[1])){ 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 });