样式

src/main/java/com/xujie/sys/common/utils/ExcelTemplateALPHA.java

@@ -303,6 +303,7 @@ public class ExcelTemplateALPHA {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         //整体填值
         for (int i = 0; i <= sheet.getLastRowNum(); i++) {
             XSSFRow row = sheet.getRow(i);
@@ -338,6 +339,8 @@ public class ExcelTemplateALPHA {
                             declarationFixedPriceCols.add(j);
                         } else if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
+                        } else if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
                         }
                     }
                 }
@@ -622,8 +625,11 @@ public class ExcelTemplateALPHA {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -915,6 +921,10 @@ public class ExcelTemplateALPHA {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private BigDecimal parseNumericString(String value) {
         if (value == null) {
             return null;

src/main/java/com/xujie/sys/common/utils/ExcelTemplateTX.java

@@ -308,6 +308,7 @@ public class ExcelTemplateTX {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         Set<Integer> packingVolumeCols = new HashSet<>();
         Set<Integer> packingNetWeightCols = new HashSet<>();
         //整体填值
@@ -345,6 +346,9 @@ public class ExcelTemplateTX {
                         if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
                         }
+                        if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
+                        }
                         if (isPackingVolumeField(dtlField)) {
                             packingVolumeCols.add(j);
                         }
@@ -652,8 +656,11 @@ public class ExcelTemplateTX {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -945,6 +952,10 @@ public class ExcelTemplateTX {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private boolean isPackingVolumeField(String field) {
         return "volume".equalsIgnoreCase(field);
     }

src/main/java/com/xujie/sys/common/utils/ExcelTemplateYB.java

@@ -305,6 +305,7 @@ public class ExcelTemplateYB {
         Set<Integer> invoiceTotalPriceCols = new HashSet<>();
         Set<Integer> declarationFixedPriceCols = new HashSet<>();
         Set<Integer> declarationQtyCols = new HashSet<>();
+        Set<Integer> declarationHsCodeDescCols = new HashSet<>();
         //整体填值
         for (int i = 0; i <= sheet.getLastRowNum(); i++) {
             XSSFRow row = sheet.getRow(i);
@@ -340,6 +341,8 @@ public class ExcelTemplateYB {
                             declarationFixedPriceCols.add(j);
                         } else if (isDeclarationQtyField(dtlField)) {
                             declarationQtyCols.add(j);
+                        } else if (isDeclarationHsCodeDescField(dtlField)) {
+                            declarationHsCodeDescCols.add(j);
                         }
                     }
                 }
@@ -625,8 +628,11 @@ public class ExcelTemplateYB {
                     font.setFontName("Arial");
                     font.setFontHeightInPoints((short) 10);
                     style.setFont(font);
-                    style.setVerticalAlignment(VerticalAlignment.CENTER);
+                    boolean declarationHsCodeDescColumn = declarationHsCodeDescCols.contains(i);
+                    boolean keepWrapText = c7.getCellStyle() != null && c7.getCellStyle().getWrapText();
+                    style.setVerticalAlignment(declarationHsCodeDescColumn ? VerticalAlignment.TOP : VerticalAlignment.CENTER);
                     style.setAlignment(HorizontalAlignment.LEFT);
+                    style.setWrapText(keepWrapText || declarationHsCodeDescColumn);
                     c7.setCellStyle(style);
                     boolean declarationFixedTwoScaleColumn = fixedDeclarationPriceScale && declarationFixedPriceCols.contains(i);
                     boolean declarationQtyColumn = fixedDeclarationPriceScale && declarationQtyCols.contains(i);
@@ -918,6 +924,10 @@ public class ExcelTemplateYB {
         return "qty".equalsIgnoreCase(field);
     }
 
+    private boolean isDeclarationHsCodeDescField(String field) {
+        return "hs_code_desc".equalsIgnoreCase(field);
+    }
+
     private BigDecimal parseNumericString(String value) {
         if (value == null) {
             return null;