潘钊 / bsth_control · Commits

Commit c6f8d82ab7f3d95b669ebaffd26f0d1f0c848172

Authored by 徐烜
1 parent b22e9e80

Update

Inline Side-by-side
Showing 2 changed files with 12 additions and 6 deletions

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

To preserve performance only 2 of 8 files are displayed.

src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @c6f8d82
@@ -374,16 +374,16 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im @@ -374,16 +374,16 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
374 } 374 }
375 375
376 // 添加一列 空驶班次/空驶里程，fcsj放置数据 376 // 添加一列 空驶班次/空驶里程，fcsj放置数据
377 - fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_ks, lc_ks), null, null, null, null)); 377 + fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
378 378
379 // 添加一列 营运班次/营运里程，fcsj放置数据 379 // 添加一列 营运班次/营运里程，fcsj放置数据
380 - fcInfos.add(new FcInfo(null, null, String.format("%d/%.2f", bc_yy, lc_yy), null, null, null, null)); 380 + fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
381 381
382 editInfo.getContents().add(fcInfos); 382 editInfo.getContents().add(fcInfos);
383 } 383 }
384 editInfo.getHeader().addAll(Arrays.asList(headarrays)); 384 editInfo.getHeader().addAll(Arrays.asList(headarrays));
385 385
386 - editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.2f,营运里程=%.2f,总里程=%.2f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy)); 386 + editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.3f,营运里程=%.3f,总里程=%.3f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
387 } 387 }
388 388
389 LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//"); 389 LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
src/main/resources/datatools/ktrs/ttinfodetailDataOutputMetaData.ktr
  View file @c6f8d82
@@ -445,7 +445,7 @@ @@ -445,7 +445,7 @@
445 <schema_name/> 445 <schema_name/>
446 </partitioning> 446 </partitioning>
447 <connection>bus_control_variable</connection> 447 <connection>bus_control_variable</connection>
448 - <sql>select &#xa;fcno&#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;,min&#x28;qdz&#x29; qdz&#xa;,min&#x28;zdz&#x29; zdz&#xa;,bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno,bc_type</sql> 448 + <sql>select &#xa;fcno&#xa;, min&#x28;xl&#x29; xl &#xa;, min&#x28;xl_dir&#x29; xl_dir&#xa;, min&#x28;qdz_code&#x29; qdz&#xa;, min&#x28;zdz_code&#x29; zdz&#xa;, min&#x28;bc_type&#x29; bc_type &#xa;from bsth_c_s_ttinfo_detail&#xa;where ttinfo &#x3d; &#x24;&#x7b;ttinfoid&#x7d;&#xa;group by fcno</sql>
449 <limit>0</limit> 449 <limit>0</limit>
450 <lookup/> 450 <lookup/>
451 <execute_each_row>N</execute_each_row> 451 <execute_each_row>N</execute_each_row>
@@ -481,8 +481,8 @@ @@ -481,8 +481,8 @@
481 <fail_on_multiple>N</fail_on_multiple> 481 <fail_on_multiple>N</fail_on_multiple>
482 <eat_row_on_failure>N</eat_row_on_failure> 482 <eat_row_on_failure>N</eat_row_on_failure>
483 <key> 483 <key>
484 - <name>zd</name>  
485 - <field>station</field> 484 + <name>xl</name>
  485 + <field>line</field>
486 <condition>&#x3d;</condition> 486 <condition>&#x3d;</condition>
487 <name2/> 487 <name2/>
488 </key> 488 </key>
@@ -492,6 +492,12 @@ @@ -492,6 +492,12 @@
492 <condition>&#x3d;</condition> 492 <condition>&#x3d;</condition>
493 <name2/> 493 <name2/>
494 </key> 494 </key>
  495 + <key>
  496 + <name>zd</name>
  497 + <field>station_code</field>
  498 + <condition>&#x3d;</condition>
  499 + <name2/>
  500 + </key>
495 <value> 501 <value>
496 <name>station_name</name> 502 <name>station_name</name>
497 <rename>zdname</rename> 503 <rename>zdname</rename>