潘钊 / bsth_control · Commits

Commit a59a1607c7ffb30fd11860d5ea4f3f70cf692827

Authored by 娄高锋
1 parent 003a592f
build: skipped

update

Inline Side-by-side
Showing 2 changed files with 24 additions and 3 deletions
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
  View file @a59a160
... ... @@ -614,16 +614,26 @@ public class SheetServiceImpl extends BaseServiceImpl<Sheet, Integer> implements
614 614 }
615 615  
616 616 if(map.containsKey("type") && map.get("type").toString().equals("export")){
  617 + String lineName = "";
  618 + if(map.containsKey("lineName"))
  619 + lineName = map.get("lineName").toString();
617 620 List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
618 621 Map<String, Object> m = new HashMap<String, Object>();
619 622 m.put("date", date);
620 623 m.put("endDate", endDate);
621 624 ReportUtils ee = new ReportUtils();
622 625 try {
  626 + String dateTime = "";
  627 + if(date.equals(endDate)){
  628 + dateTime = date.replaceAll("-", "");
  629 + } else {
  630 + dateTime = date.replaceAll("-", "")+"-"+
  631 + endDate.replaceAll("-", "");
  632 + }
623 633 listI.add(listmap.iterator());
624 634 String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
625 635 ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList.xls",
626   - path + "export/发车准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
  636 + path + "export/"+dateTime+"-"+lineName+"-发车准点率.xls");
627 637 } catch (Exception e) {
628 638 // TODO: handle exception
629 639 e.printStackTrace();
... ...
src/main/resources/static/pages/report/sheet/sheetList.html
  View file @a59a160
... ... @@ -312,9 +312,20 @@
312 312 var endDate = $("#endDate").val();
313 313 var fgs=$('#fgsdm').val();
314 314 var gs=$('#gsdm').val();
  315 + var lineName = $('#line option:selected').text();
  316 + if(lineName == "全部线路")
  317 + lineName = $('#fgsdm option:selected').text();
315 318 var i = layer.load(2);
316   - $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,type:"export"},function(result){
317   - window.open("/downloadFile/download?fileName=发车准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
  319 + $get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,type:"export",lineName:lineName},function(result){
  320 + var dateTime = "";
  321 + if(date == endDate){
  322 + dateTime = moment(date).format("YYYYMMDD");
  323 + } else {
  324 + dateTime = moment(date).format("YYYYMMDD")+"-"+
  325 + moment(endDate).format("YYYYMMDD");
  326 + }
  327 + window.open("/downloadFile/download?fileName="
  328 + +dateTime+"-"+lineName+"-发车准点率");
318 329 layer.close(i);
319 330 });
320 331 // $("#forms_h").table2excel({
... ...