quangdn - add download template and import template

pom.xml

@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>4.0.1</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
         <dependency>
@@ -131,7 +131,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.17</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>org.quartz-scheduler</groupId>

src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java

@@ -20,6 +20,7 @@ import cz.jirutka.rsql.parser.ast.RSQLVisitor;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.hibernate.SQLQuery;
 import org.hibernate.Session;
@@ -980,7 +981,7 @@ public class CustomerServiceImpl implements CustomerService {
             FileInputStream fis = new FileInputStream(file);
             workbook = new XSSFWorkbook(fis);
             ByteArrayOutputStream os = new ByteArrayOutputStream();
-            Sheet sheet = workbook.getSheetAt(0);
+            XSSFSheet sheet = workbook.getSheetAt(0);
             Row row = sheet.getRow(3);
 
             //<editor-fold desc="Tạo style cho cột kết quả" defaultstate="collapsed">
@@ -1001,7 +1002,9 @@ public class CustomerServiceImpl implements CustomerService {
             if (row.getPhysicalNumberOfCells() > header.size()) {
                 for (int i = 0; i < row.getPhysicalNumberOfCells(); i++) {
                     if (isColumnNullOrBlank(sheet, i)) {
-                        deleteNullColumn(sheet, i);
+                        sheet.shiftColumns(i + 1, i + 1, -1);
+                        sheet.removeMergedRegion(0);
+                        sheet.addMergedRegion(new CellRangeAddress(0, 1, 0, 13));
                     }
                 }
                 for (int i = 0; i < header.size(); i++) {
@@ -1036,7 +1039,10 @@ public class CustomerServiceImpl implements CustomerService {
                 result.put("content", Files.readAllBytes(file.toPath()));
                 return result;
             } else {
-                Cell resultCell = sheet.getRow(3).createCell(sheet.getRow(3).getPhysicalNumberOfCells());
+                Cell resultCell = sheet.getRow(3).getCell(header.size());
+                if (resultCell == null) {
+                    resultCell = sheet.getRow(3).createCell(header.size());
+                }
                 resultCell.setCellValue(BundleUtils.getLangString("customer.result", locale));
                 resultCell.setCellStyle(resultStyle);
             }
@@ -1424,13 +1430,6 @@ public class CustomerServiceImpl implements CustomerService {
         return true;
     }
 
-    private void deleteNullColumn(Sheet sheet, int columnIndex) {
-        for (Row row : sheet) {
-            if (row.getRowNum() < 3) continue;
-            Cell cell = row.getCell(columnIndex, Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
-            row.removeCell(cell);
-        }
-    }
     //</editor-fold>
 
     @Override