Update

徐烜
1 parent 57e2a2c8
Showing 2 changed files with 25 additions and 5 deletions
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
@@ -271,7 +271,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                 for (int r = 1; r < sheet.getRows(); r++) {
                     List<FcInfo> fcInfos = new ArrayList<>();
                     // 每行第一列都是路牌
-                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null)); // 用fcsj放置路牌显示
                     int bc_ks = 0; // 空驶班次
                     int bc_yy = 0; // 营运班次
@@ -294,7 +294,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             String qdzCode = content == null ? "" : content[7]; // 起点站编码
                             String zdzCode = content == null ? "" : content[8]; // 终点站编码
-                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
+                            String ists = content == null ? "" : content[9]; // 是否停驶
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists);
                             if (StringUtils.isNotEmpty(fzdname))
                                 headarrays[c] = fzdname;
@@ -328,10 +330,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                     }
                     // 添加一列 空驶班次/空驶里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null, null));
                     // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null));
                     editInfo.getContents().add(fcInfos);
                 }
@@ -29,6 +29,8 @@ public interface TTInfoDetailForEdit {
         private String qdzCode;
         /** 终点站code */
         private String zdzCode;
+        /** 是否停驶 */
+        private Boolean ists;
         public FcInfo() {
         }
@@ -40,7 +42,8 @@ public interface TTInfoDetailForEdit {
                 String xldir,
                 String isfb,
                 String qdzCode,
-                String zdzCode) {
+                String zdzCode,
+                String ists) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -59,6 +62,13 @@ public interface TTInfoDetailForEdit {
                 this.zdzCode = zdzCode;
             }
+            if ("N".equals(ists))
+                this.ists = false;
+            else if ("Y".equals(ists) || "true".equals(ists))
+                this.ists = true;
+            else
+                this.ists = false;
+
         }
         public Long getTtdid() {
@@ -116,6 +126,14 @@ public interface TTInfoDetailForEdit {
         public void setZdzCode(String zdzCode) {
             this.zdzCode = zdzCode;
         }
+
+        public Boolean getIsts() {
+            return ists;
+        }
+
+        public void setIsts(Boolean ists) {
+            this.ists = ists;
+        }
     }
     /**