Commit 9d4fe8d85ba147a5001456287d50bf511b3f0bc6
1 parent
3b26722b
LGF 导出
Showing
5 changed files
with
8 additions
and
7 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
| ... | ... | @@ -326,13 +326,14 @@ public class BusIntervalServiceImpl implements BusIntervalService { |
| 326 | 326 | |
| 327 | 327 | String[] date1 = startDate.split("-"); |
| 328 | 328 | String[] date2 = endDate.split("-"); |
| 329 | - startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日"; | |
| 330 | - endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日"; | |
| 329 | +// startDate = date1[0] + "年" + date1[1] + "月" + date1[2] + "日"; | |
| 330 | +// endDate = date2[0] + "年" + date2[1] + "月" + date2[2] + "日"; | |
| 331 | 331 | String Date = ""; |
| 332 | 332 | if(startDate.equals(endDate)) |
| 333 | - Date = startDate; | |
| 333 | + Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日"; | |
| 334 | 334 | else |
| 335 | - Date = startDate + "--" + endDate; | |
| 335 | + Date = date1[0] + "年" + date1[1] + "月" + date1[2] + "日" + "--" | |
| 336 | + + date2[0] + "年" + date2[1] + "月" + date2[2] + "日"; | |
| 336 | 337 | |
| 337 | 338 | // String[] split = times.split("-"); |
| 338 | 339 | // int startTime = Integer.valueOf(split[0].split(":")[0])*60 + Integer.valueOf(split[0].split(":")[1]); |
| ... | ... | @@ -526,7 +527,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { |
| 526 | 527 | try { |
| 527 | 528 | listI.add(resList.iterator()); |
| 528 | 529 | String path = this.getClass().getResource("/").getPath()+"static\\pages\\forms\\"; |
| 529 | - ee.excelReplace(listI, new Object[] { m }, path+"mould\\interval.xls", | |
| 530 | + ee.excelReplace(listI, new Object[] { m }, path+"mould\\busInterval"+statu+".xls", | |
| 530 | 531 | path+"export\\班次间隔统计表" + sdfSimple.format(sdfMonth.parse(startDate)) |
| 531 | 532 | + "-" + sdfSimple.format(sdfMonth.parse(endDate)) + ".xls"); |
| 532 | 533 | } catch (Exception e) { | ... | ... |
src/main/resources/static/pages/forms/mould/busInterval0.xls
0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/mould/busInterval1.xls
0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/statement/busInterval.html
| ... | ... | @@ -73,7 +73,7 @@ |
| 73 | 73 | <!-- </div> --> |
| 74 | 74 | <div class="form-group" style="margin-left: 14px"> |
| 75 | 75 | <input class="btn btn-default" type="button" id="query" value="筛选"/> |
| 76 | -<!-- <input class="btn btn-default" type="button" id="export" value="导出"/> --> | |
| 76 | + <input class="btn btn-default" type="button" id="export" value="导出"/> | |
| 77 | 77 | </div> |
| 78 | 78 | </form> |
| 79 | 79 | </div> | ... | ... |