bug

src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

@@ -414,11 +414,33 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 String blockName = row.getCell(1).getStringCellValue().trim();
                 String unitName = row.getCell(2).getStringCellValue().trim();
                 String floorName = row.getCell(3).getStringCellValue().trim();
-                String roomName = row.getCell(4).getStringCellValue().trim();
-                BigDecimal price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
-                String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
-                String split = heatString.substring(0, heatString.indexOf("."));
-                Integer heat = Integer.valueOf(split);
+
+                String roomName = "";
+                try{
+                    roomName = row.getCell(4).getStringCellValue().trim();
+                }catch (Exception e){
+                    String roomNameString = String.valueOf(row.getCell(4).getNumericCellValue());
+                    roomName = roomNameString.substring(0, roomNameString.indexOf("."));
+                }
+
+                BigDecimal price;
+                try {
+                    price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
+                }catch (Exception e){
+                    price = new BigDecimal(row.getCell(5).getStringCellValue());
+                }
+
+                Integer heat = 0;
+                try {
+                    String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
+                    String split = heatString.substring(0, heatString.indexOf("."));
+                    heat = Integer.valueOf(split);
+                }catch (Exception e){
+                    String heatString = row.getCell(6).getStringCellValue();
+                    heat = Integer.valueOf(heatString);
+                }
+
+
                 Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
 
                 int currentRow = j + 1;