Commit 2d11a531d4ed466e2f7f51705e8fc6445463470d
1 parent
feba253d
mcy
Showing
14 changed files
with
4 additions
and
2 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
| @@ -231,7 +231,7 @@ public class ExportController { | @@ -231,7 +231,7 @@ public class ExportController { | ||
| 231 | listI.add(resList.iterator()); | 231 | listI.add(resList.iterator()); |
| 232 | String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\"; | 232 | String path = this.getClass().getResource("/").getPath() + "static\\pages\\forms\\"; |
| 233 | ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls", | 233 | ee.excelReplace(listI, new Object[] { map }, path + "mould\\vehicleloading.xls", |
| 234 | - path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("dat").toString())) + ".xls"); | 234 | + path + "export\\车辆加注" + sdfSimple.format(sdfMonth.parse(map.get("data").toString())) + ".xls"); |
| 235 | } catch (Exception e) { | 235 | } catch (Exception e) { |
| 236 | e.printStackTrace(); | 236 | e.printStackTrace(); |
| 237 | } | 237 | } |
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
| @@ -290,6 +290,7 @@ public class FormsServiceImpl implements FormsService { | @@ -290,6 +290,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 290 | 290 | ||
| 291 | List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() { | 291 | List<Changetochange> list = jdbcTemplate.query(sql, new RowMapper<Changetochange>() { |
| 292 | 292 | ||
| 293 | + | ||
| 293 | @Override | 294 | @Override |
| 294 | public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException { | 295 | public Changetochange mapRow(ResultSet arg0, int arg1) throws SQLException { |
| 295 | Changetochange chan = new Changetochange(); | 296 | Changetochange chan = new Changetochange(); |
| @@ -314,6 +315,7 @@ public class FormsServiceImpl implements FormsService { | @@ -314,6 +315,7 @@ public class FormsServiceImpl implements FormsService { | ||
| 314 | return list; | 315 | return list; |
| 315 | } | 316 | } |
| 316 | 317 | ||
| 318 | + | ||
| 317 | // 路单数据 | 319 | // 路单数据 |
| 318 | @Override | 320 | @Override |
| 319 | public List<Singledata> singledata(Map<String, Object> map) { | 321 | public List<Singledata> singledata(Map<String, Object> map) { |
src/main/resources/static/pages/forms/statement/allline.html renamed to src/main/resources/static/pages/mforms/alllines/allline.html
src/main/resources/static/pages/forms/statement/changetochange.html renamed to src/main/resources/static/pages/mforms/changetochanges/changetochange.html
src/main/resources/static/pages/forms/statement/executionrate.html renamed to src/main/resources/static/pages/mforms/executionrates/executionrate.html
src/main/resources/static/pages/forms/statement/linepassengerflow.html renamed to src/main/resources/static/pages/mforms/linepassengerflows/linepassengerflow.html
src/main/resources/static/pages/forms/statement/operationservice.html renamed to src/main/resources/static/pages/mforms/operationservices/operationservice.html
src/main/resources/static/pages/forms/statement/shifday.html renamed to src/main/resources/static/pages/mforms/shifdays/shifday.html
src/main/resources/static/pages/forms/statement/shiftuehiclemanth.html renamed to src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
src/main/resources/static/pages/forms/statement/singledata.html renamed to src/main/resources/static/pages/mforms/singledatas/singledata.html
src/main/resources/static/pages/forms/statement/turnoutrate.html renamed to src/main/resources/static/pages/mforms/turnoutrates/turnoutrate.html
src/main/resources/static/pages/forms/statement/vehicleloading.html renamed to src/main/resources/static/pages/mforms/vehicleloadings/vehicleloading.html
src/main/resources/static/pages/forms/statement/waybillday.html renamed to src/main/resources/static/pages/mforms/waybilldays/waybillday.html
src/main/resources/static/pages/report/message/message.html