diff --git a/build.gradle b/build.gradle index 623c878..3d5529e 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '1.1.7' + version '1.1.8' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/util/UtilExcel.java b/src/main/java/com/taover/util/UtilExcel.java index 684e121..0ff4c64 100644 --- a/src/main/java/com/taover/util/UtilExcel.java +++ b/src/main/java/com/taover/util/UtilExcel.java @@ -15,6 +15,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.util.HSSFColor; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -296,7 +297,7 @@ public class UtilExcel { }else if(cell.getCellType() == HSSFCell.CELL_TYPE_BOOLEAN){ dataRow.add(Boolean.valueOf(cell.getBooleanCellValue())); }else if(cell.getCellType() == HSSFCell.CELL_TYPE_FORMULA){ - dataRow.add(""); + dataRow.add(""+cell.getCellFormula()); //dataRow.add(cell.getNumericCellValue()); }else{ dataRow.add(cell.getStringCellValue()); diff --git a/src/main/java/com/taover/util/UtilPinyin.java b/src/main/java/com/taover/util/UtilPinyin.java index 3b98e30..437644f 100644 --- a/src/main/java/com/taover/util/UtilPinyin.java +++ b/src/main/java/com/taover/util/UtilPinyin.java @@ -5,6 +5,8 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat; import net.sourceforge.pinyin4j.format.HanyuPinyinToneType; import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination; + + public class UtilPinyin { /** * 对单个字进行转换 -- libgit2 0.21.2