潘钊 / bsth_control · Commits

Commit dec696fb61ec60d9a78c98600796b7b31c9c6974

Authored by 娄高锋
1 parent 6f344775
build: skipped

update

Inline Side-by-side
Showing 3 changed files with 39 additions and 0 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @dec696f
@@ -113,6 +113,12 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -113,6 +113,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
113 schedule.setSpId(rs.getLong("sp_id")); 113 schedule.setSpId(rs.getLong("sp_id"));
114 schedule.setSflj(rs.getBoolean("sflj")); 114 schedule.setSflj(rs.getBoolean("sflj"));
115 115
  116 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  117 + schedule.setFcsjActual(null);
  118 + }
  119 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  120 + schedule.setZdsjActual(null);
  121 + }
116 String[] split1 = schedule.getFcsj().split(":"); 122 String[] split1 = schedule.getFcsj().split(":");
117 String[] split3 = schedule.getZdsj().split(":"); 123 String[] split3 = schedule.getZdsj().split(":");
118 long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]); 124 long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
@@ -669,6 +675,13 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -669,6 +675,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
669 schedule.setjName(rs.getString("j_name")); 675 schedule.setjName(rs.getString("j_name"));
670 schedule.setStatus(rs.getInt("status")); 676 schedule.setStatus(rs.getInt("status"));
671 schedule.setSpId(rs.getLong("sp_id")); 677 schedule.setSpId(rs.getLong("sp_id"));
  678 +
  679 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  680 + schedule.setFcsjActual(null);
  681 + }
  682 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  683 + schedule.setZdsjActual(null);
  684 + }
672 if(schedule.getDfsj() != null){ 685 if(schedule.getDfsj() != null){
673 String[] split0 = schedule.getDfsj().split(":"); 686 String[] split0 = schedule.getDfsj().split(":");
674 long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]); 687 long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
@@ -1840,6 +1853,13 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1840,6 +1853,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1840 schedule.setjName(rs.getString("j_name")); 1853 schedule.setjName(rs.getString("j_name"));
1841 schedule.setUpdateDate(rs.getDate("update_date")); 1854 schedule.setUpdateDate(rs.getDate("update_date"));
1842 1855
  1856 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  1857 + schedule.setFcsjActual(null);
  1858 + }
  1859 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  1860 + schedule.setZdsjActual(null);
  1861 + }
  1862 +
1843 return schedule; 1863 return schedule;
1844 } 1864 }
1845 }); 1865 });
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @dec696f
@@ -81,6 +81,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -81,6 +81,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
81 schedule.setsName(rs.getString("s_name")); 81 schedule.setsName(rs.getString("s_name"));
82 schedule.setSpId(rs.getLong("sp_id")); 82 schedule.setSpId(rs.getLong("sp_id"));
83 83
  84 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  85 + schedule.setFcsjActual(null);
  86 + }
  87 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  88 + schedule.setZdsjActual(null);
  89 + }
84 if(schedule.getFcsj() != null && schedule.getZdsj() != null){ 90 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
85 String[] split1 = schedule.getFcsj().split(":"); 91 String[] split1 = schedule.getFcsj().split(":");
86 String[] split2 = schedule.getZdsj().split(":"); 92 String[] split2 = schedule.getZdsj().split(":");
@@ -548,6 +554,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -548,6 +554,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
548 schedule.setQdzName(rs.getString("qdz_name")); 554 schedule.setQdzName(rs.getString("qdz_name"));
549 schedule.setSpId(rs.getLong("sp_id")); 555 schedule.setSpId(rs.getLong("sp_id"));
550 556
  557 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  558 + schedule.setFcsjActual(null);
  559 + }
  560 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  561 + schedule.setZdsjActual(null);
  562 + }
551 if(schedule.getFcsj() != null && schedule.getZdsj() != null){ 563 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
552 String[] split1 = schedule.getFcsj().split(":"); 564 String[] split1 = schedule.getFcsj().split(":");
553 String[] split2 = schedule.getZdsj().split(":"); 565 String[] split2 = schedule.getZdsj().split(":");
@@ -831,6 +843,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService { @@ -831,6 +843,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
831 schedule.setQdzName(rs.getString("qdz_name")); 843 schedule.setQdzName(rs.getString("qdz_name"));
832 schedule.setSpId(rs.getLong("sp_id")); 844 schedule.setSpId(rs.getLong("sp_id"));
833 845
  846 + if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
  847 + schedule.setFcsjActual(null);
  848 + }
  849 + if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
  850 + schedule.setZdsjActual(null);
  851 + }
834 if(schedule.getFcsj() != null && schedule.getZdsj() != null){ 852 if(schedule.getFcsj() != null && schedule.getZdsj() != null){
835 String[] split1 = schedule.getFcsj().split(":"); 853 String[] split1 = schedule.getFcsj().split(":");
836 String[] split2 = schedule.getZdsj().split(":"); 854 String[] split2 = schedule.getZdsj().split(":");
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
  View file @dec696f
@@ -354,6 +354,7 @@ @@ -354,6 +354,7 @@
354 _w_table_rowspan("#works", 4); 354 _w_table_rowspan("#works", 4);
355 } 355 }
356 }); 356 });
  357 + $("html,body").animate({scrollTop:$("#works").offset().top},700);
357 }); 358 });
358 }); 359 });
359 } 360 }