소스 검색

修正注释问题,紧急修复一个模板导出的问题

4.1.3.A
jueyue 9 년 전
부모
커밋
0badfd2a40
13개의 변경된 파일22개의 추가작업 그리고 28개의 파일을 삭제
  1. +1
    -0
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java
  2. +0
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java
  3. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java
  4. +10
    -12
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java
  5. +0
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java
  6. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java
  7. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java
  8. +0
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java
  9. +2
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java
  10. +2
    -2
      easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java
  11. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java
  12. +3
    -3
      easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java
  13. +0
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java

+ 1
- 0
easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java 파일 보기

@@ -123,6 +123,7 @@ public class ExcelExportUtil {
* 模板集合
* @return
*/
@Deprecated
public static Workbook exportExcel(TemplateExportParams params, Class<?> pojoClass,
Collection<?> dataSet, Map<String, Object> map) {
return new ExcelExportOfTemplateUtil().createExcleByTemplate(params, pojoClass, dataSet,


+ 0
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/entity/params/ExcelBaseEntity.java 파일 보기

@@ -52,7 +52,6 @@ public class ExcelBaseEntity {
private Method method;
/**
* 这个是不是超链接,如果是需要实现接口返回对象
* @return
*/
private boolean hyperlink;


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java 파일 보기

@@ -152,7 +152,7 @@ public class ExcelExportServer extends ExcelExportBase {
}
try {
dataHanlder = entity.getDataHanlder();
if (dataHanlder != null) {
if (dataHanlder != null && dataHanlder.getNeedHandlerFields() != null) {
needHanlderList = Arrays.asList(dataHanlder.getNeedHandlerFields());
}
// 创建表格样式


+ 10
- 12
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java 파일 보기

@@ -78,7 +78,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
/**
* 往Sheet 填充正常数据,根据表头信息 使用导入的部分逻辑,坐对象映射
*
* @param teplateParams
* @param sheet
* @param pojoClass
* @param dataSet
* @param workbook
@@ -124,7 +124,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
/**
* 下移数据
* @param its
* @param dataSet
* @param excelParams
* @return
*/
@@ -204,10 +204,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
/**
* 克隆excel防止操作原对象,workbook无法克隆,只能对excel进行克隆
*
* @param teplateParams
* @throws Exception
* @author JueYue
* 2013-11-11
*/
private Workbook getCloneWorkBook() throws Exception {
return ExcelCache.getWorkbook(teplateParams.getTemplateUrl(), teplateParams.getSheetNum(),
@@ -218,7 +215,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
/**
* 获取表头数据,设置表头的序号
*
* @param teplateParams
* @param sheet
* @return
*/
@@ -349,7 +345,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
* 利用foreach循环输出数据
* @param cell
* @param map
* @param oldString
* @param name
* @throws Exception
*/
private void addListDataToExcel(Cell cell, Map<String, Object> map,
@@ -417,12 +413,15 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
MergedRegionHelper mergedRegionHelper) throws Exception {
//所有的cell创建一遍
for (int i = 0; i < rowspan; i++) {
int size = columns.size();//判断是不是超出设置了
for (int j = columnIndex, max = columnIndex + colspan; j < max; j++) {
if (row.getCell(j) == null) {
row.createCell(j);
CellStyle style = row.getRowNum() % 2 == 0
? getStyles(false, columns.get(columnIndex - j))
: getStyles(true, columns.get(columnIndex - j));
? getStyles(false,
size >= j - columnIndex ? null : columns.get(j - columnIndex))
: getStyles(true,
size >= j - columnIndex ? null : columns.get(j - columnIndex));
//返回的styler不为空时才使用,否则使用Excel设置的,更加推荐Excel设置的样式
if (style != null)
row.getCell(j).setCellStyle(style);
@@ -501,7 +500,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
* 设置合并单元格的样式
* @param row
* @param ci
* @param excelForEachParams
* @param params
*/
private void setMergedRegionStyle(Row row, int ci, ExcelForEachParams params) {
//第一行数据
@@ -593,7 +592,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
/**
* 获取模板参数
* @param string
* @param name
* @param cell
* @param mergedRegionHelper
* @return
@@ -628,7 +627,6 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase {
*
* @param excelParams
* @param titlemap
* @return
*/
private void sortAndFilterExportField(List<ExcelExportEntity> excelParams,
Map<String, Integer> titlemap) {


+ 0
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/graph/builder/ExcelChartBuildService.java 파일 보기

@@ -149,7 +149,6 @@ public class ExcelChartBuildService {

/**
* 构建图形对象
* @param workbook
* @param dataSourceSheet
* @param tragetSheet
* @param graph


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/html/ExcelToHtmlServer.java 파일 보기

@@ -242,7 +242,7 @@ public class ExcelToHtmlServer {
* 获取图片最大宽度
* @param colIndex
* @param sheet
* @param span
* @param rowAndColSpan
* @return
*/
private int getImageMaxWidth(Integer[] rowAndColSpan, int colIndex, Sheet sheet) {


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java 파일 보기

@@ -56,7 +56,7 @@ public class CellValueServer {
* 获取单元格内的值
*
* @param cell
* @param colInfo
* @param entity
* @return
*/
private Object getCellValue(String xclass, Cell cell, ExcelImportEntity entity) {


+ 0
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java 파일 보기

@@ -86,7 +86,6 @@ public class ExcelImportServer extends ImportBaseService {
/***
* 向List里面继续添加元素
*
* @param exclusions
* @param object
* @param param
* @param row


+ 2
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/sax/parse/SaxRowRead.java 파일 보기

@@ -157,16 +157,15 @@ public class SaxRowRead extends ImportBaseService implements ISaxRowRead {
}
/***
/**
* 向List里面继续添加元素
*
* @param exclusions
* @param object
* @param param
* @param datas
* @param titlemap
* @param targetId
* @param params
* @throws Exception
*/
private void addListContinue(Object object, ExcelCollectionParams param,
List<SaxReadCellEntity> datas, Map<Integer, String> titlemap,


+ 2
- 2
easypoi-base/src/main/java/org/jeecgframework/poi/pdf/export/PdfExportServer.java 파일 보기

@@ -169,7 +169,7 @@ public class PdfExportServer extends ExportBase {
* @param table
* @param obj
* @param rowHeight
* @param list
* @param excelParams
* @throws Exception
*/
private void createListCells(PdfPTable table, Object obj, List<ExcelExportEntity> excelParams,
@@ -247,7 +247,7 @@ public class PdfExportServer extends ExportBase {
* 创建表头
*
* @param title
* @param index
* @param table
*/
private int createTitleRow(PdfExportParams title, PdfPTable table,
List<ExcelExportEntity> excelParams) {


+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/util/PoiElUtil.java 파일 보기

@@ -132,7 +132,7 @@ public final class PoiElUtil {
/**
* 判断是不是常量
* @param string
* @param param
* @return
*/
private static String isConstant(String param) {


+ 3
- 3
easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java 파일 보기

@@ -66,10 +66,10 @@ public class ParseWord07 {
Object[] isAndType = PoiPublicUtil.getIsAndType(obj);
String picId;
try {
picId = currentRun.getParagraph().getDocument().addPictureData((byte[]) isAndType[0],
picId = currentRun.getDocument().addPictureData((byte[]) isAndType[0],
(Integer) isAndType[1]);
((MyXWPFDocument) currentRun.getParagraph().getDocument()).createPicture(currentRun,
picId, currentRun.getParagraph().getDocument()
((MyXWPFDocument) currentRun.getDocument()).createPicture(currentRun,
picId, currentRun.getDocument()
.getNextPicNameNumber((Integer) isAndType[1]),
obj.getWidth(), obj.getHeight());


+ 0
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/excel/ExcelEntityParse.java 파일 보기

@@ -200,7 +200,6 @@ public class ExcelEntityParse extends ExportBase {
*
* @param excelParams
* @param titlemap
* @return
*/
private void sortAndFilterExportField(List<ExcelExportEntity> excelParams,
Map<String, Integer> titlemap) {


불러오는 중...
취소
저장