动态生成时刻表修正，直接打开时刻表可以导出

徐烜
1 parent 0c6c5b95
Showing 5 changed files with 38 additions and 8 deletions
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/resources/static/pages/base/timesmodel/js/add-form-reload.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/Main_v2_2_ExcelObj.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/main_v2_2.js
@@ -454,6 +454,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
  
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 0; i < groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -566,6 +579,19 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
  
         StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
         StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+
+        // TODO
+        Map<String, Object> param = new HashMap<>();
+        param.put("station.id_eq", null);
+        if (station1 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId1());
+            station1 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+        if (station2 == null) {
+            param.put("station.id_eq", lpObjList.get(0).getStationRouteId2());
+            station2 = ((List<StationRoute>) stationRouteService.list(param)).get(0);
+        }
+
         for (int i = 1; i <= groupCount; i++) {
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 1), station1.getStationName(), new Color(0x96b9d7));
             excelPoiOperator.createStringCell(wb, lpHeadRow, (short) (i * 2 + 2), station2.getStationName(), new Color(0x96b9d7));
@@ -644,7 +670,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             cell.setCellValue(bcObj.getFcsj() + "X");
                         } else { // 一个车次链
                             cell = lpRow.getCell((short) (bcObj.getGroupNo() * 2 + bcObj.getGroupBcNo() + 3));
-                            cell.setCellValue(bcObj.getFcsj() + "X");
+                            if (cell != null) {
+                                cell.setCellValue(bcObj.getFcsj() + "X");
+                            }
                         }
                         break;
                     case LC:
@@ -3,7 +3,7 @@
 	if (!$('body').hasClass('page-sidebar-closed')) {
 		$('.menu-toggler.sidebar-toggler').click();
 	}
-	
+
 	$('.openHaveSkb').on('click',function() {
 		var skbId = $("#skbNameSelect").val();
 		var argus = {
@@ -66,6 +66,8 @@
 			CSMap = getMaxCarAndStopSpace0(map,seMap);
             // 发车间隙
             map.fcjx = CSMap.fcjx;
+            map.stt = "1";
+            _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap);
 		}else if(map.baseRes== '1') {
 			CSMap = getMaxCarAndStopSpace1(map);
             // 发车间隙
@@ -144,7 +146,7 @@
         // // 初始化右键菜单.
         // contextInit(graph);
  
-        if (map.baseRes == '3' || map.baseRes == '1') {
+        if (map.baseRes == '3' || map.baseRes == '1' || map.baseRes == '0') {
             // 导入导出设置
             // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
  
@@ -581,10 +581,10 @@ var Main_v2_2_ExcelObj = (function() {
                         "zdzid": oGanttBc.zdz, // 终点站id
  
                         "isUp": bIsUp, // 是否上行
-                        "isFb": null, // 是否分班（_resetBdOutInLcBcGroup方法修正）
+                        "isFb": false, // 是否分班（_resetBdOutInLcBcGroup方法修正）
  
                         "bcType": oGanttBc.bcType, // 班次类型（bc、out、in、lc）
-                        "fcsj": oGanttBc.fcsj, // 发车时间描述
+                        "fcsj": (oGanttBc.fcsj == null ? "" : oGanttBc.fcsj), // 发车时间描述
  
                         "groupNo": -99, // 第几圈（_resetBdOutInLcBcGroup方法修正）
                         "groupBcNo": -99, // 圈里第几个班次（_resetBdOutInLcBcGroup方法修正）
@@ -43,7 +43,7 @@ var Main_v2_2 = function() {
             schedule.fnAdjustHeadway();
             // 4、计算吃饭班次
             schedule.fnCalcuEatBc();
-            // // 6、计算末班车
+            // // 6、计算末班车（TODO：这里家里末班车，貌似导出Excel会报错，待修正）
             // schedule.fnCalcuLastBc();
             // 7、重新设置停站时间
             schedule.fnReSetLayoverTime();
@@ -64,8 +64,8 @@ var Main_v2_2 = function() {
          * 导出时刻表配置。
          * @param fnGetGanttBc 获取gantt班次方法
          */
-        exportExcelConfig: function(fnGetGanttBc) {
-            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
+        exportExcelConfig: function(paramobj, fnGetGanttBc) {
+            var oExcel = new Main_v2_2_ExcelObj(paramobj, fnGetGanttBc);
  
             $('.exportAddXls').off('click');
             $('.exportAddXlsx').off('click');