潘钊 / bsth_control · Commits

Commit 1d3d241feac828852d42f7122472973d93774673

Authored by 潘钊
1 parent 5309c5c5

update..

Inline Side-by-side
Showing 2 changed files with 18 additions and 1 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
  View file @1d3d241
@@ -380,7 +380,7 @@ public class GpsServiceImpl implements GpsService { @@ -380,7 +380,7 @@ public class GpsServiceImpl implements GpsService {
380 int sWeekOfYear = sCal.get(Calendar.WEEK_OF_YEAR); 380 int sWeekOfYear = sCal.get(Calendar.WEEK_OF_YEAR);
381 Calendar eCal = Calendar.getInstance(); 381 Calendar eCal = Calendar.getInstance();
382 eCal.setTime(new Date(et * 1000)); 382 eCal.setTime(new Date(et * 1000));
383 - int eWeekOfYear = eCal.get(Calendar.DAY_OF_YEAR); 383 + int eWeekOfYear = eCal.get(Calendar.WEEK_OF_YEAR);
384 384
385 //按年分表 385 //按年分表
386 String tableName = "bsth_c_arrival_info_" + fmtyyyy.print(st); 386 String tableName = "bsth_c_arrival_info_" + fmtyyyy.print(st);
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
  View file @1d3d241
@@ -37,6 +37,8 @@ var gb_schedule_table = (function () { @@ -37,6 +37,8 @@ var gb_schedule_table = (function () {
37 rs[lineCode].sort(schedule_sort); 37 rs[lineCode].sort(schedule_sort);
38 //calc shift 38 //calc shift
39 $.each(rs[lineCode], function () { 39 $.each(rs[lineCode], function () {
  40 + if(this.status==-1)
  41 + clearActualTime(this);
40 calc_sch_real_shift(this); 42 calc_sch_real_shift(this);
41 line2Schedule[lineCode][this.id] = this; 43 line2Schedule[lineCode][this.id] = this;
42 //子任务公里是否与计划平 44 //子任务公里是否与计划平
@@ -308,6 +310,8 @@ var gb_schedule_table = (function () { @@ -308,6 +310,8 @@ var gb_schedule_table = (function () {
308 //var tMaps = {}; 310 //var tMaps = {};
309 $.each(schArr, function () { 311 $.each(schArr, function () {
310 try { 312 try {
  313 + if(this.status==-1)
  314 + clearActualTime(this);
311 //子任务公里是否与计划平 315 //子任务公里是否与计划平
312 this.c_t_mileage_status = calcCTaskMileageStatus(this); 316 this.c_t_mileage_status = calcCTaskMileageStatus(this);
313 line2Schedule[this.xlBm][this.id] = this; 317 line2Schedule[this.xlBm][this.id] = this;
@@ -332,6 +336,8 @@ var gb_schedule_table = (function () { @@ -332,6 +336,8 @@ var gb_schedule_table = (function () {
332 if (!isArray(schArr)) 336 if (!isArray(schArr))
333 schArr = [schArr]; 337 schArr = [schArr];
334 $.each(schArr, function () { 338 $.each(schArr, function () {
  339 + if(this.status==-1)
  340 + clearActualTime(this);
335 line2Schedule[this.xlBm][this.id] = this; 341 line2Schedule[this.xlBm][this.id] = this;
336 }); 342 });
337 }; 343 };
@@ -795,6 +801,17 @@ var gb_schedule_table = (function () { @@ -795,6 +801,17 @@ var gb_schedule_table = (function () {
795 } 801 }
796 }; 802 };
797 803
  804 + var clearActualTime = function (sch) {
  805 + try{
  806 + sch.fcsjActual=null;
  807 + sch.fcsjActualTime=null;
  808 + sch.zdsjActual=null;
  809 + sch.zdsjActualTime=null;
  810 + }catch (e){
  811 + console.log(e);
  812 + }
  813 + };
  814 +
798 return { 815 return {
799 show: show, 816 show: show,
800 findScheduleByLine: findScheduleByLine, 817 findScheduleByLine: findScheduleByLine,