Commit ff1badf0139899aa0cb586cc2560bbcf01db65d5
1 parent
42dc3898
大间隔导出模板
Showing
5 changed files
with
3 additions
and
2 deletions
src/main/java/com/bsth/service/calc/impl/CalcIntervalServiceImpl.java
| @@ -94,6 +94,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -94,6 +94,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 94 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); | 94 | m.put("fgs", BasicData.businessFgsCodeNameMap.get(rs.getString("fgsdm")+"_"+rs.getString("gsdm"))); |
| 95 | m.put("xlBm", rs.getString("xl")); | 95 | m.put("xlBm", rs.getString("xl")); |
| 96 | m.put("line", rs.getString("xl_name")); | 96 | m.put("line", rs.getString("xl_name")); |
| 97 | + m.put("xlName", rs.getString("xl_name"));//与另一个导出通用 | ||
| 97 | m.put("id", rs.getInt("id")); | 98 | m.put("id", rs.getInt("id")); |
| 98 | m.put("bcs", rs.getString("jhszfcs")); | 99 | m.put("bcs", rs.getString("jhszfcs")); |
| 99 | m.put("zdbcs", rs.getString("sjszfczds")); | 100 | m.put("zdbcs", rs.getString("sjszfczds")); |
| @@ -184,7 +185,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | @@ -184,7 +185,7 @@ public class CalcIntervalServiceImpl extends BaseServiceImpl<CalcInterval,Intege | ||
| 184 | } | 185 | } |
| 185 | 186 | ||
| 186 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls, | 187 | ee.excelReplace(listI, new Object[]{m}, path + "mould/" + ""+xls, |
| 187 | - path + "export/"+dateTime+"-"+lineName+xlsName); | 188 | + path + "export/"+dateTime+"-"+lineName+"-"+xlsName); |
| 188 | } catch (Exception e) { | 189 | } catch (Exception e) { |
| 189 | // TODO: handle exception | 190 | // TODO: handle exception |
| 190 | e.printStackTrace(); | 191 | e.printStackTrace(); |
src/main/resources/static/pages/forms/mould/calcIntervalCount.xls
0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/mould/calcIntervalList1.xls
0 → 100644
No preview for this file type
src/main/resources/static/pages/forms/mould/interval.xls
0 → 100644
No preview for this file type
src/main/resources/static/pages/report/sheet/intervalCount.html
| @@ -410,7 +410,7 @@ | @@ -410,7 +410,7 @@ | ||
| 410 | +dateTime+"-"+lineName+"-发车到站准点率"); | 410 | +dateTime+"-"+lineName+"-发车到站准点率"); |
| 411 | }else{ | 411 | }else{ |
| 412 | window.open("/downloadFile/download?fileName=" | 412 | window.open("/downloadFile/download?fileName=" |
| 413 | - +dateTime+"-"+lineName+"大间隔汇总表"); | 413 | + +dateTime+"-"+lineName+"-大间隔汇总表"); |
| 414 | } | 414 | } |
| 415 | 415 | ||
| 416 | layer.close(i); | 416 | layer.close(i); |