潘钊 / bsth_control · Commits

Commit feaea495f9c2f94dd968be3e7abdc0543862b685

Authored by 徐烜
1 parent 57e2a2c8

Update

Inline Side-by-side
Showing 2 changed files with 25 additions and 5 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 2 of 22 files are displayed.

src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
  View file @feaea49
... ... @@ -271,7 +271,7 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
271 271 for (int r = 1; r < sheet.getRows(); r++) {
272 272 List<FcInfo> fcInfos = new ArrayList<>();
273 273 // 每行第一列都是路牌
274   - fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
  274 + fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null, null)); // 用fcsj放置路牌显示
275 275  
276 276 int bc_ks = 0; // 空驶班次
277 277 int bc_yy = 0; // 营运班次
... ... @@ -294,7 +294,9 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
294 294 String qdzCode = content == null ? "" : content[7]; // 起点站编码
295 295 String zdzCode = content == null ? "" : content[8]; // 终点站编码
296 296  
297   - FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
  297 + String ists = content == null ? "" : content[9]; // 是否停驶
  298 +
  299 + FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode, ists);
298 300  
299 301 if (StringUtils.isNotEmpty(fzdname))
300 302 headarrays[c] = fzdname;
... ... @@ -328,10 +330,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
328 330 }
329 331  
330 332 // 添加一列 空驶班次/空驶里程，fcsj放置数据
331   - fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
  333 + fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null, null));
332 334  
333 335 // 添加一列 营运班次/营运里程，fcsj放置数据
334   - fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
  336 + fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null, null));
335 337  
336 338 editInfo.getContents().add(fcInfos);
337 339 }
... ...
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
  View file @feaea49
... ... @@ -29,6 +29,8 @@ public interface TTInfoDetailForEdit {
29 29 private String qdzCode;
30 30 /** 终点站code */
31 31 private String zdzCode;
  32 + /** 是否停驶 */
  33 + private Boolean ists;
32 34  
33 35 public FcInfo() {
34 36 }
... ... @@ -40,7 +42,8 @@ public interface TTInfoDetailForEdit {
40 42 String xldir,
41 43 String isfb,
42 44 String qdzCode,
43   - String zdzCode) {
  45 + String zdzCode,
  46 + String ists) {
44 47 this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
45 48 this.bc_type = bc_type;
46 49 this.fcsj = fcsj;
... ... @@ -59,6 +62,13 @@ public interface TTInfoDetailForEdit {
59 62 this.zdzCode = zdzCode;
60 63 }
61 64  
  65 + if ("N".equals(ists))
  66 + this.ists = false;
  67 + else if ("Y".equals(ists) || "true".equals(ists))
  68 + this.ists = true;
  69 + else
  70 + this.ists = false;
  71 +
62 72 }
63 73  
64 74 public Long getTtdid() {
... ... @@ -116,6 +126,14 @@ public interface TTInfoDetailForEdit {
116 126 public void setZdzCode(String zdzCode) {
117 127 this.zdzCode = zdzCode;
118 128 }
  129 +
  130 + public Boolean getIsts() {
  131 + return ists;
  132 + }
  133 +
  134 + public void setIsts(Boolean ists) {
  135 + this.ists = ists;
  136 + }
119 137 }
120 138  
121 139 /**
... ...