lin 4 jaren geleden
bovenliggende
commit
d46f7ab6bd

+ 4 - 4
smart-city-platform/src/main/java/com/bz/smart_city/excel/resolver/WaterDeviceResolverExcelTemplate.java

@@ -67,8 +67,8 @@ public class WaterDeviceResolverExcelTemplate extends AbstractResolverExcelTempl
                     Cell customerNameCell = row.getCell(8);
                     Cell customerIdCell = row.getCell(9);
                     Cell locDescCell = row.getCell(10);
-                    Cell floorCell = row.getCell(11);
-                    Cell c_remark = row.getCell(12);
+                    //Cell floorCell = row.getCell(11);
+                    Cell c_remark = row.getCell(11);
 
                     buildingNameCell.setCellType(CellType.STRING);
                     deviceNoCell.setCellType(CellType.STRING);
@@ -160,9 +160,9 @@ public class WaterDeviceResolverExcelTemplate extends AbstractResolverExcelTempl
                     } else if (locDescCell.getCellTypeEnum() == CellType.STRING) {
                         device.setLocDesc(locDescCell.getStringCellValue().trim());
                     }
-                    if (floorCell != null) {
+                    /*if (floorCell != null) {
                         device.setFloor((int) floorCell.getNumericCellValue());
-                    }
+                    }*/
                     if (customerIdCell != null) {
                         try {
                             CellValue cellValuesetCustomerId = evaluator.evaluate(customerIdCell);

BIN
smart-city-platform/src/main/resources/excel/deviceTemplateV3.xlsx


BIN
smart-city-platform/src/main/resources/excel/gdDeviceTemplate20200914.xlsx