From a0a1f84bb716e73b11410b6977ec4107b46fef33 Mon Sep 17 00:00:00 2001 From: xfworld Date: Thu, 26 May 2016 14:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E4=B8=A2=E5=A4=B1=E7=9A=84?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 - easypoi-annotation/build.gradle | 7 +++- easypoi-base/build.gradle | 7 +++- .../poi/excel/entity/ExportExcelItem.java | 35 +++++++++++++++++++ easypoi-web/build.gradle | 4 +++ 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java diff --git a/build.gradle b/build.gradle index 77f88e5..3d66316 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ apply plugin : 'eclipse' allprojects { apply plugin: 'maven' - group = 'org.jeecg' version = '2.3.0' } diff --git a/easypoi-annotation/build.gradle b/easypoi-annotation/build.gradle index 2323840..ebb92ad 100644 --- a/easypoi-annotation/build.gradle +++ b/easypoi-annotation/build.gradle @@ -1,2 +1,7 @@ -apply plugin: "java" +apply plugin : "java" +apply plugin : 'eclipse' + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' diff --git a/easypoi-base/build.gradle b/easypoi-base/build.gradle index d0bcc87..9a116a4 100644 --- a/easypoi-base/build.gradle +++ b/easypoi-base/build.gradle @@ -1,11 +1,16 @@ apply plugin: "java" apply plugin: "eclipse" + + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' dependencies { compile group: 'org.apache.poi', name: 'poi', version:'3.10-FINAL' compile group: 'org.apache.poi', name: 'poi-ooxml', version:'3.10-FINAL' compile(group: 'org.apache.poi', name: 'poi-ooxml-schemas', version:'3.10-FINAL') { -exclude(module: 'xercesImpl') + exclude(module: 'xercesImpl') } compile group: 'xerces', name: 'xercesImpl', version:'2.9.1' compile group: 'org.apache.poi', name: 'poi-scratchpad', version:'3.10-FINAL' diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java new file mode 100644 index 0000000..d2b99b7 --- /dev/null +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/ExportExcelItem.java @@ -0,0 +1,35 @@ +/** + * + */ +package org.jeecgframework.poi.excel.entity; + +import java.util.List; +import java.util.Map; + +import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity; + +/** + * @author xfworld + * @since 2016-5-26 + * @version 1.0 + */ +public class ExportExcelItem { + private List entityList; + private List> resultList; + + public List getEntityList() { + return this.entityList; + } + + public void setEntityList(List entityList) { + this.entityList = entityList; + } + + public List> getResultList() { + return this.resultList; + } + + public void setResultList(List> resultList) { + this.resultList = resultList; + } +} diff --git a/easypoi-web/build.gradle b/easypoi-web/build.gradle index cb7f70b..b3122e3 100644 --- a/easypoi-web/build.gradle +++ b/easypoi-web/build.gradle @@ -1,4 +1,8 @@ apply plugin: "java" +apply plugin: "eclipse" +sourceCompatibility = 1.7 +targetCompatibility = 1.7 +[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8' description = '' dependencies { compile group: 'org.springframework', name: 'spring-web', version:'3.1.1.RELEASE'