refs #67 Excelの書式の比較は大文字・小文字を区別しないで比較するよう修正。

mygreen · Feb 28, 2016 · 3b6a1ac · 3b6a1ac
1 parent 55d5ed9
commit 3b6a1ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/gh/mygreen/xlsmapper/cellconvert/converter/AbstractDateCellConverter.java b/src/main/java/com/gh/mygreen/xlsmapper/cellconvert/converter/AbstractDateCellConverter.java
@@ -250,7 +250,7 @@ public Cell toCell(final FieldAdaptor adaptor, final Date targetValue, final She
         }
 
         // セルの書式の設定
-        if(Utils.isNotEmpty(anno.excelPattern()) && !POIUtils.getCellFormatPattern(cell).equals(anno.excelPattern())) {
+        if(Utils.isNotEmpty(anno.excelPattern()) && !POIUtils.getCellFormatPattern(cell).equalsIgnoreCase(anno.excelPattern())) {
 
             // 既にCell中に書式が設定され、それが異なる場合
             CellStyle style = sheet.getWorkbook().createCellStyle();

diff --git a/...main/java/com/gh/mygreen/xlsmapper/cellconvert/converter/AbstractNumberCellConverter.java b/...main/java/com/gh/mygreen/xlsmapper/cellconvert/converter/AbstractNumberCellConverter.java
@@ -366,7 +366,7 @@ public Cell toCell(final FieldAdaptor adaptor, final Number targetValue, final S
         }
 
         // セルの書式の設定
-        if(Utils.isNotEmpty(anno.excelPattern()) && !POIUtils.getCellFormatPattern(cell).equals(anno.excelPattern())) {
+        if(Utils.isNotEmpty(anno.excelPattern()) && !POIUtils.getCellFormatPattern(cell).equalsIgnoreCase(anno.excelPattern())) {
 
             // 既にCell中に書式が設定され、それが異なる場合
             CellStyle style = sheet.getWorkbook().createCellStyle();