Browse Source

修复params 为空的bug

4.1.3.A
jueyue 10 years ago
parent
commit
101513bba8
3 changed files with 22 additions and 14 deletions
  1. +3
    -4
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java
  2. +1
    -1
      easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java
  3. +18
    -9
      easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java

+ 3
- 4
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java View File

@@ -82,9 +82,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
// 获取实体对象的导出数据 // 获取实体对象的导出数据
List<ExcelExportEntity> excelParams = new ArrayList<ExcelExportEntity>(); List<ExcelExportEntity> excelParams = new ArrayList<ExcelExportEntity>();
getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null); getAllExcelField(null, targetId, fileds, excelParams, pojoClass, null);
if (excelParams.size() == 0) {
return;
}
// 根据表头进行筛选排序 // 根据表头进行筛选排序
sortAndFilterExportField(excelParams, titlemap); sortAndFilterExportField(excelParams, titlemap);
short rowHeight = getRowHeight(excelParams); short rowHeight = getRowHeight(excelParams);
@@ -92,7 +89,9 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
//下移数据,模拟插入 //下移数据,模拟插入
sheet.shiftRows(params.getHeadingRows() + params.getHeadingStartRow(), sheet.shiftRows(params.getHeadingRows() + params.getHeadingStartRow(),
sheet.getLastRowNum(), getShiftRows(dataSet, excelParams), true, true); sheet.getLastRowNum(), getShiftRows(dataSet, excelParams), true, true);
if (excelParams.size() == 0) {
return;
}
Iterator<?> its = dataSet.iterator(); Iterator<?> its = dataSet.iterator();
while (its.hasNext()) { while (its.hasNext()) {
Object t = its.next(); Object t = its.next();


+ 1
- 1
easypoi-test/src/main/java/org/jeecgframework/poi/test/entity/TeacherEntity.java View File

@@ -18,7 +18,7 @@ public class TeacherEntity implements java.io.Serializable {
@Excel(name = "老师ID_teacherEntity,老师属性_courseEntity", orderNum = "2", needMerge = false) @Excel(name = "老师ID_teacherEntity,老师属性_courseEntity", orderNum = "2", needMerge = false)
private String id; private String id;
/** name */ /** name */
@Excel(name = "语文老师_yuwen,数学老师_shuxue", orderNum = "2", mergeVertical = true)
@Excel(name = "老师姓名_yuwen,数学老师_shuxue", orderNum = "2", mergeVertical = true)
private String name; private String name;
/* /*


+ 18
- 9
easypoi-test/src/main/java/org/jeecgframework/poi/test/excel/test/ExcelExportTemplateTest.java View File

@@ -23,19 +23,30 @@ public class ExcelExportTemplateTest {
List<CourseEntity> list = new ArrayList<CourseEntity>(); List<CourseEntity> list = new ArrayList<CourseEntity>();
CourseEntity courseEntity; CourseEntity courseEntity;
//@Test
@Test
public void one() throws Exception { public void one() throws Exception {
TemplateExportParams params = new TemplateExportParams();
TemplateExportParams params = new TemplateExportParams(
"org/jeecgframework/poi/test/excel/doc/exportTemp.xls", 0, 1);
params.setHeadingRows(2); params.setHeadingRows(2);
params.setHeadingStartRow(2); params.setHeadingStartRow(2);
params.setStyle(ExcelStyleType.BORDER.getClazz()); params.setStyle(ExcelStyleType.BORDER.getClazz());
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
//sheet 1
map.put("year", "2013"); map.put("year", "2013");
map.put("sunCourses", list.size()); map.put("sunCourses", list.size());
Map<String, Object> obj = new HashMap<String, Object>(); Map<String, Object> obj = new HashMap<String, Object>();
map.put("obj", obj); map.put("obj", obj);
obj.put("name", list.size()); obj.put("name", list.size());
params.setTemplateUrl("org/jeecgframework/poi/excel/doc/exportTemp.xls");
// sheet 2
map.put("month", 10);
Map<String, Object> temp;
for (int i = 1; i < 8; i++) {
temp = new HashMap<String, Object>();
temp.put("per", i * 10);
temp.put("mon", i * 1000);
temp.put("summon", i * 10000);
map.put("i" + i, temp);
}
Workbook book = ExcelExportUtil.exportExcel(params, CourseEntity.class, list, map); Workbook book = ExcelExportUtil.exportExcel(params, CourseEntity.class, list, map);
File savefile = new File("d:/"); File savefile = new File("d:/");
if (!savefile.exists()) { if (!savefile.exists()) {
@@ -78,9 +89,10 @@ public class ExcelExportTemplateTest {
} }
} }
@Test
//@Test
public void two() throws Exception { public void two() throws Exception {
TemplateExportParams params = new TemplateExportParams();
TemplateExportParams params = new TemplateExportParams(
"org/jeecgframework/poi/test/excel/doc/exportTemp.xls", 1);
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put("month", 10); map.put("month", 10);
Map<String, Object> temp; Map<String, Object> temp;
@@ -91,9 +103,7 @@ public class ExcelExportTemplateTest {
temp.put("summon", i * 10000); temp.put("summon", i * 10000);
map.put("i" + i, temp); map.put("i" + i, temp);
} }
params.setTemplateUrl("org/jeecgframework/poi/test/excel/doc/exportTemp.xls");
params.setSheetNum(new Integer[]{1});
Workbook book = ExcelExportUtil.exportExcel(params, CourseEntity.class, list, map);
Workbook book = ExcelExportUtil.exportExcel(params, map);
File savefile = new File("d:/"); File savefile = new File("d:/");
if (!savefile.exists()) { if (!savefile.exists()) {
savefile.mkdirs(); savefile.mkdirs();
@@ -103,5 +113,4 @@ public class ExcelExportTemplateTest {
fos.close(); fos.close();
} }
} }

Loading…
Cancel
Save