1、修改时刻表编辑用ktr，将bcsj字段加入

2、修改时刻表编辑对应服务，将bcsj加入 3、修改drools关于时刻表验证规则，加入bcsj验证 4、修改前端时刻表编辑指令和相关controll，添加bcsj指令 5、修改前端时刻表编辑指令，修改isValid验证逻辑

1、修改时刻表编辑用ktr，将bcsj字段加入
2、修改时刻表编辑对应服务，将bcsj加入 3、修改drools关于时刻表验证规则，加入bcsj验证 4、修改前端时刻表编辑指令和相关controll，添加bcsj指令 5、修改前端时刻表编辑指令，修改isValid验证逻辑
徐烜
1 parent 5ff4f17c
Showing 3 changed files with 29 additions and 6 deletions
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
src/main/java/com/bsth/service/schedule/impl/plan/kBase3/validate/timetable/ErrorBcCountFunction.java
@@ -348,7 +348,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, null)); // 用fcsj放置路牌显示
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null, null)); // 用fcsj放置路牌显示
                     int bc_ks = 0; // 空驶班次
                     int bc_yy = 0; // 营运班次
@@ -373,7 +373,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
                             String ists = content == null ? "" : content[9]; // 是否停驶
-                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists);
+                            String bcsj = content == null ? "" : content[10]; // 班次时间
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists, bcsj);
                             if (StringUtils.isNotEmpty(fzdname))
                                 headarrays[c] = fzdname;
@@ -407,10 +409,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, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null, null, null));
                     // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null));
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null, null));
                     editInfo.getContents().add(fcInfos);
                 }
@@ -31,6 +31,8 @@ public interface TTInfoDetailForEdit {
         private String zdzCode;
         /** 是否停驶 */
         private Boolean ists;
+        /** 班次时间 */
+        private String bcsj;
         public FcInfo() {
         }
@@ -43,7 +45,8 @@ public interface TTInfoDetailForEdit {
                 String isfb,
                 String qdzCode,
                 String zdzCode,
-                String ists) {
+                String ists,
+                String bcsj) {
             this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
             this.bc_type = bc_type;
             this.fcsj = fcsj;
@@ -69,6 +72,10 @@ public interface TTInfoDetailForEdit {
             else
                 this.ists = false;
+            if (StringUtils.isNotEmpty(bcsj) && !"null".equals(bcsj)) {
+                this.bcsj = bcsj;
+            }
+
         }
         public Long getTtdid() {
@@ -134,6 +141,14 @@ public interface TTInfoDetailForEdit {
         public void setIsts(Boolean ists) {
             this.ists = ists;
         }
+
+        public String getBcsj() {
+            return bcsj;
+        }
+
+        public void setBcsj(String bcsj) {
+            this.bcsj = bcsj;
+        }
     }
     /**
@@ -59,10 +59,16 @@ public class ErrorBcCountFunction implements AccumulateFunction {
             return;
         }
+        // 判定条件（数据库中的对应字段没有非空约束），与界面saTimeTable.js的validInfo方法对应
+        // 1、起点站编码，名字为空
+        // 2、终点站编码，名字为空
+        // 3、班次时间
+        // TODO：其他再议
         if (StringUtils.isEmpty(ttInfoDetail.getQdzCode()) ||
             StringUtils.isEmpty(ttInfoDetail.getQdzName()) ||
             StringUtils.isEmpty(ttInfoDetail.getZdzCode()) ||
-            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ) {
+            StringUtils.isEmpty(ttInfoDetail.getZdzName()) ||
+            (ttInfoDetail.getBcsj() == null) ) {
             errorCountData.errorcount ++;
         }