Commit 8767a5b460bf4f2fe6bf320f88c902772226c692

Authored by 娄高锋
1 parent a4df684a

update excel sheet表单名称改成日期

src/main/java/com/bsth/controller/oil/DlbController.java
@@ -175,13 +175,14 @@ public class DlbController extends BaseController<Dlb, Integer>{ @@ -175,13 +175,14 @@ public class DlbController extends BaseController<Dlb, Integer>{
175 resList.add(m); 175 resList.add(m);
176 } 176 }
177 try { 177 try {
  178 + map.put("sheetName", map.get("rq"));
178 listI.add(resList.iterator()); 179 listI.add(resList.iterator());
179 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 180 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
180 ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls", 181 ee.excelReplace(listI, new Object[] { map }, path+"mould/listDl.xls",
181 path+"export/"+map.get("rq").toString()+ "进出场存电量.xls"); 182 path+"export/"+map.get("rq").toString()+ "进出场存电量.xls");
182 } catch (Exception e) { 183 } catch (Exception e) {
183 e.printStackTrace(); 184 e.printStackTrace();
184 - } 185 + }
185 186
186 return resList; 187 return resList;
187 188
src/main/java/com/bsth/controller/oil/YlbController.java
@@ -276,6 +276,7 @@ public class YlbController extends BaseController<Ylb, Integer>{ @@ -276,6 +276,7 @@ public class YlbController extends BaseController<Ylb, Integer>{
276 resList.add(m); 276 resList.add(m);
277 } 277 }
278 try { 278 try {
  279 + map.put("sheetName", map.get("rq"));
279 listI.add(resList.iterator()); 280 listI.add(resList.iterator());
280 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/"; 281 String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
281 ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls", 282 ee.excelReplace(listI, new Object[] { map }, path+"mould/list.xls",
src/main/java/com/bsth/util/ReportUtils.java
@@ -47,6 +47,10 @@ public class ReportUtils { @@ -47,6 +47,10 @@ public class ReportUtils {
47 POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream( 47 POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
48 sourcePath)); 48 sourcePath));
49 HSSFWorkbook wb = new HSSFWorkbook(fs); 49 HSSFWorkbook wb = new HSSFWorkbook(fs);
  50 + Map<String, Object> m = (Map<String, Object>)tArray[0];
  51 + if(m.containsKey("sheetName") && m.get("sheetName")!=null
  52 + && m.get("sheetName").toString().trim().length()!=0)
  53 + wb.setSheetName(0, m.get("sheetName").toString());
50 HSSFSheet sheet = wb.getSheetAt(0); 54 HSSFSheet sheet = wb.getSheetAt(0);
51 HSSFRow row; 55 HSSFRow row;
52 HSSFCell cell = null; 56 HSSFCell cell = null;