diff --git a/emis-biz/emis-biz.iml b/emis-biz/emis-biz.iml index e3c7d4976..31792c29f 100644 --- a/emis-biz/emis-biz.iml +++ b/emis-biz/emis-biz.iml @@ -41,6 +41,8 @@ + + diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelTemplateProc.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelTemplateProc.java index f6f8afad3..fdc555b10 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelTemplateProc.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/billexport/ExcelTemplateProc.java @@ -1,6 +1,5 @@ package com.xdadan.erp.emis.service.billexport; -import com.xdadan.erp.emis.service.billexport.DynamicDataMapping; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.CellCopyPolicy; import org.apache.poi.ss.usermodel.Workbook; @@ -128,8 +127,8 @@ public class ExcelTemplateProc { return; } for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) { - XSSFCell cell = row.getCell(i); - fillInTemplateCellDataValue(cell, dataPrefix, dataMap); +// XSSFCell cell = row.getCell(i); +// fillInTemplateCellDataValue(cell, dataPrefix, dataMap); } } @@ -162,7 +161,7 @@ public class ExcelTemplateProc { } } if (flag) { - cell.setCellValue(cellValue); +// cell.setCellValue(cellValue); } } @@ -179,15 +178,15 @@ public class ExcelTemplateProc { return null; } for (int j = row.getFirstCellNum(); j < row.getLastCellNum(); j++) { - XSSFCell cell = row.getCell(j); - String value = cell.getStringCellValue(); - if (value != null) { - for (DynamicDataMapping dynamicData : dynamicDataMappingList) { - if (value.startsWith("{{" + dynamicData.getDataId() + ".")) { - return dynamicData; - } - } - } +// XSSFCell cell = row.getCell(j); +// String value = cell.getStringCellValue(); +// if (value != null) { +// for (DynamicDataMapping dynamicData : dynamicDataMappingList) { +// if (value.startsWith("{{" + dynamicData.getDataId() + ".")) { +// return dynamicData; +// } +// } +// } } return null; }