taov-erp / com-taover-util

Download as
Browse Code »

Commit 57b3d3a39bf853f7867b7b6f2424b78b182fe8d8

Authored by gaoming
1 parent 228ba2fb
Exists in master

优化

Showing 3 changed files with 5 additions and 2 deletions   Show diff stats
build.gradle
  Diff comments   View file @57b3d3a
... ... @@ -54,7 +54,7 @@ uploadArchives {
54 54 authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD)
55 55 }
56 56 pom.project {
57   - version '1.1.7'
  57 + version '1.1.8'
58 58 artifactId ARTIFACT_Id
59 59 groupId GROUP_ID
60 60 packaging TYPE
... ...
src/main/java/com/taover/util/UtilExcel.java
  Diff comments   View file @57b3d3a
... ... @@ -15,6 +15,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
15 15 import org.apache.poi.hssf.util.HSSFColor;
16 16 import org.apache.poi.ss.usermodel.Cell;
17 17 import org.apache.poi.ss.usermodel.CellStyle;
  18 +import org.apache.poi.ss.usermodel.CellType;
18 19 import org.apache.poi.ss.usermodel.Row;
19 20 import org.apache.poi.ss.usermodel.Sheet;
20 21 import org.apache.poi.ss.usermodel.Workbook;
... ... @@ -296,7 +297,7 @@ public class UtilExcel {
296 297 }else if(cell.getCellType() == HSSFCell.CELL_TYPE_BOOLEAN){
297 298 dataRow.add(Boolean.valueOf(cell.getBooleanCellValue()));
298 299 }else if(cell.getCellType() == HSSFCell.CELL_TYPE_FORMULA){
299   - dataRow.add("");
  300 + dataRow.add(""+cell.getCellFormula());
300 301 //dataRow.add(cell.getNumericCellValue());
301 302 }else{
302 303 dataRow.add(cell.getStringCellValue());
... ...
src/main/java/com/taover/util/UtilPinyin.java
  Diff comments   View file @57b3d3a
... ... @@ -5,6 +5,8 @@ import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
5 5 import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
6 6 import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
7 7  
  8 +
  9 +
8 10 public class UtilPinyin {
9 11 /**
10 12 * 对单个字进行转换
... ...