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

潘钊
2 parents ad73f7c4 c9d53510
Showing 1 changed file with 20 additions and 2 deletions
src/main/resources/static/pages/base/timesmodel/js/v2/ParameterObj.js
@@ -390,9 +390,18 @@ var ParameterObj = function() {
          */
         getUpLastDtimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.up.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.up.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         /**
          * 获取下行首班时间对象。
@@ -410,9 +419,18 @@ var ParameterObj = function() {
          */
         getDownLastDTimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.down.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.down.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
  
         //-------------- 获取吃饭时间 ----------------//